[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - unotools/source
unotools/source/misc/fontdefs.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit df967d58b8e7aa640370819c1d4c5728f937c39d
Author: Tomofumi Yagi
Date: Thu Jan 29 20:12:47 2015 +0900
fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.
GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex."HGS Gothic M").
Because, the conversion table "aImplLocalizedNamesList[]" is wrong.
http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181
This causes the assertion from
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.
This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.
Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14317
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/unotools/source/misc/fontdefs.cxx
b/unotools/source/misc/fontdefs.cxx
index 61f6a07..38cfdcf 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
{ "mdeasop", aMDEasop },
{ "hggothice",aHGGothicE },
{ "hgpgothice", aHGPGothicE },
-{ "hgpothice",aHGSGothicE },
+{ "hgsgothice", aHGSGothicE },
{ "hggothicm",aHGGothicM },
{ "hgpgothicm", aHGPGothicM },
-{ "hgpgothicm", aHGSGothicM },
+{ "hgsgothicm", aHGSGothicM },
{ "hggyoshotai", aHGGyoshotai },
{ "hgpgyoshotai", aHGPGyoshotai },
{ "hgsgyoshotai", aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source include/tools
basic/source/runtime/methods1.cxx |2 +-
basic/source/runtime/runtime.cxx | 26 +-
basic/source/sbx/sbxvalue.cxx | 28 ++--
include/tools/ref.hxx |2 ++
4 files changed, 30 insertions(+), 28 deletions(-)
New commits:
commit 6e1d28efb3d314d553e970f197f19636ce4e0ded
Author: Juan Picca
Date: Sun Feb 1 00:49:08 2015 -0200
fdo#39440: replace C-style cast's
* Add get() method to tools::SvRef
Change-Id: I3825852176c9c37f3ee21f4fd57328b1c7451951
Reviewed-on: https://gerrit.libreoffice.org/14268
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 11c8bd6..a4376de 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1832,7 +1832,7 @@ RTLFUNC(Split)
{
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
xVar->PutString( vRet[i] );
-pArray->Put( (SbxVariable*)xVar, &i );
+pArray->Put( xVar.get(), &i );
}
// return array
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 0dea790..e87a109 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1278,7 +1278,7 @@ SbiForStack* SbiRuntime::FindForStackItemForCollection(
class BasicCollection* p
{
for (SbiForStack *p = pForStk; p; p = p->pNext)
{
-SbxVariable* pVar = p->refEnd.Is() ? (SbxVariable*)p->refEnd : NULL;
+SbxVariable* pVar = p->refEnd.Is() ? p->refEnd.get() : NULL;
if( p->eForType == FOR_EACH_COLLECTION && pVar != NULL &&
PTR_CAST(BasicCollection,pVar) == pCollection )
{
@@ -1713,7 +1713,7 @@ void SbiRuntime::StepPUT()
// store on its own method (inside a function)?
bool bFlagsChanged = false;
SbxFlagBits n = SBX_NONE;
-if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
+if( refVar.get() == static_cast(pMeth) )
{
bFlagsChanged = true;
n = refVar->GetFlags();
@@ -1865,13 +1865,13 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal,
SbxVariableRef& refVar, b
{
bool bFlagsChanged = false;
SbxFlagBits n = SBX_NONE;
-if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
+if( refVar.get() == static_cast(pMeth) )
{
bFlagsChanged = true;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
-SbProcedureProperty* pProcProperty =
PTR_CAST(SbProcedureProperty,(SbxVariable*)refVar);
+SbProcedureProperty* pProcProperty = PTR_CAST(SbProcedureProperty,
refVar.get());
if( pProcProperty )
{
pProcProperty->setSet( true );
@@ -1907,7 +1907,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal,
SbxVariableRef& refVar, b
SbxObject* pObj = NULL;
-pObj = PTR_CAST(SbxObject,(SbxVariable*)refVar);
+pObj = PTR_CAST(SbxObject,refVar.get());
// calling GetObject on a SbxEMPTY variable raises
// object not set errors, make sure its an Object
@@ -2066,7 +2066,7 @@ void SbiRuntime::StepLSET()
else
{
SbxFlagBits n = refVar->GetFlags();
-if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
+if( refVar.get() == static_cast(pMeth) )
{
refVar->SetFlag( SBX_WRITE );
}
@@ -2102,7 +2102,7 @@ void SbiRuntime::StepRSET()
else
{
SbxFlagBits n = refVar->GetFlags();
-if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
+if( refVar.get() == static_cast(pMeth) )
{
refVar->SetFlag( SBX_WRITE );
}
@@ -3103,7 +3103,7 @@ void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
{
Any aElem = p->xEnumeration->nextElement();
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
-unoToSbxValue( (SbxVariable*)xVar, aElem );
+unoToSbxValue( xVar.get(), aElem );
(*pForStk->refVar) = *xVar;
}
else
@@ -3239,7 +3239,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef&
refVal,
bool bOk = bDefault;
SbxDataType t = refVal->GetType();
-SbxVariable* pVal = (SbxVariable*)refVal;
+SbxVariable* pVal = refVal.get();
// we don't know the type of uno properties that are (maybevoid)
if ( t == SbxEMPTY && refVal->ISA(SbUnoProperty) )
{
@@ -3597,7 +3597,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj,
sal_uInt32 nOp1, sal_uInt
SbxVariableRef refTemp = pElem;
// dissolve the notify while copying variable
-SbxVariable* pNew = new SbxVariable( *((SbxVariable*)pElem) );
+SbxVariable* pNew = new SbxVariable( *pElem );
pElem->SetParameters( NULL );
pElem = pNew;
LibreOffice Gerrit News for core on 2015-02-05
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Icon theme compression in https://gerrit.libreoffice.org/14327 from Andrew Dent about module icon-themes + Implement search funtion in Expert Configuration dialog. in https://gerrit.libreoffice.org/14322 from Mihály Palenik about module cui End of freshness + Resolves tdo#89129: crash when defining a specific relationship in https://gerrit.libreoffice.org/14325 from Julien Nabet about module vcl + fdo#69552 [part 1] make calc functions CEILING comply with ODF1.2 in https://gerrit.libreoffice.org/7088 from Winfried Donkers about module formula, include, sc + tdf#87309: SVG - use black as default currentColor if no color was specif in https://gerrit.libreoffice.org/14242 from Christina Roßmanith about module svgio * Merged changes on master for project core changed in the last 25 hours: + Fix a little bit creative pi value in https://gerrit.libreoffice.org/14295 from Takeshi Abe + Activate mork driver on windows 64 bit build in https://gerrit.libreoffice.org/14275 from David Ostrovsky + Fix graphite on windows 64 bit in https://gerrit.libreoffice.org/14316 from David Ostrovsky + Fix jpeg-turbo on windows 64 bit in https://gerrit.libreoffice.org/14315 from David Ostrovsky * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + wip: get rid of svx dbtoolsclient in https://gerrit.libreoffice.org/11737 from Lionel Elie Mamane + fdo#86606 removal of direct formatting options from the context menu in https://gerrit.libreoffice.org/13196 from Yousuf Philips + Fix typo code Persistant in https://gerrit.libreoffice.org/14030 from Andrea Gelmini + fdo#88309: Standardize, cleanup, and improve Assertions in https://gerrit.libreoffice.org/13945 from Ashod Nakashian + --with-macosx-app-name= is unused, so bin it from AC_ARG_WITH list in https://gerrit.libreoffice.org/13658 from Douglas Mencken + fdo#30541: Default icon set on Windows should be Galaxy, not Tango. in https://gerrit.libreoffice.org/13859 from Rimas Kudelis + fdo#63905: fix regression by using paper size set in printer properties in https://gerrit.libreoffice.org/13763 from Clément Lassieur + fdo#75825-"Send Document as E-Mail" not working in https://gerrit.libreoffice.org/13786 from Charu Tyagi + solenv-filelists.pm: fix "can't call method `mode' on an undefined value" in https://gerrit.libreoffice.org/13669 from Douglas Mencken + gbuild-to-ide fixes in https://gerrit.libreoffice.org/11754 from Peter Foley + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura in https://gerrit.libreoffice.org/13290 from Christoph Lutz + start detection of kf5 stuff in configure.ac in https://gerrit.libreoffice.org/13079 from Jonathan Riddell + more breeze icons in https://gerrit.libreoffice.org/13058 from Jonathan Riddell + Perftest for loading autocorrect dictionaries, related fdo#79761 in https://gerrit.libreoffice.org/11296 from Matúš Kukan Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 3 commits - android/Bootstrap android/experimental
android/Bootstrap/Makefile.shared
|2
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 25 +--
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|5 +
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|5 +
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
| 35 ++
5 files changed, 65 insertions(+), 7 deletions(-)
New commits:
commit 5026658efd1e6deae22a89bff137b37cd3bce6bb
Author: Miklos Vajna
Date: Wed Feb 4 17:45:00 2015 +0100
android: fix missing drawingML preset shapes
Change-Id: I7a22b9bcacd26b837c00bb09743ab2e176d60746
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 77d2bcf..12b4774 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -138,6 +138,8 @@ copy-stuff:
rm -Rf assets/share # pre-clean it
mkdir -p assets/share/config
cp -R $(INSTDIR)/share/registry assets/share
+# Filter data is needed by e.g. the drawingML preset shape import.
+ cp -R $(INSTDIR)/share/filter assets/share
# Make sure the soffice.cfg directory is always created, it's not possible to
hit any keys without it.
if ! test z$(DISABLE_UI) = zTRUE; then \
echo "Copying UI files into the apk"; \
commit d0e4a943b8762c3653de2b31a84635ab75f76cd5
Author: Tomaž Vajngerl
Date: Thu Jan 29 19:03:07 2015 +0900
tdf#87098 don't adjust zoom/position for spreadsheets
Change-Id: Ieb908980a931b123e2c48fe3ecdc7830b48810ed
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 83cf5ec..afc9028 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -69,16 +69,27 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
mViewportMetrics = mLayerClient.getViewportMetrics();
mLayerClient.setViewportMetrics(mViewportMetrics);
-if (mTileProvider.isTextDocument()) {
+zoomAndRepositionTheDocument();
+
+mLayerClient.forceRedraw();
+}
+
+private void zoomAndRepositionTheDocument() {
+if (mTileProvider.isSpreadsheet()) {
+// Don't do anything for spreadsheets - show at 100%
+} else if (mTileProvider.isTextDocument()) {
+// Always zoom text document to the beginning of the document and
centered by width
float centerY = mViewportMetrics.getCssViewport().centerY();
-mLayerClient.zoomTo(new RectF (0, centerY,
mTileProvider.getPageWidth(), centerY));
-} else if (mViewportMetrics.getViewport().width() <
mViewportMetrics.getViewport().height()) {
-mLayerClient.zoomTo(mTileProvider.getPageWidth(), 0);
+mLayerClient.zoomTo(new RectF(0, centerY,
mTileProvider.getPageWidth(), centerY));
} else {
-mLayerClient.zoomTo(0, mTileProvider.getPageHeight());
+// Other documents - always show the whole document on the screen,
+// regardless of document shape and orientation.
+if (mViewportMetrics.getViewport().width() <
mViewportMetrics.getViewport().height()) {
+mLayerClient.zoomTo(mTileProvider.getPageWidth(), 0);
+} else {
+mLayerClient.zoomTo(0, mTileProvider.getPageHeight());
+}
}
-
-mLayerClient.forceRedraw();
}
/** Invalidate everything + handle the geometry change */
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index c39609d..5f82763 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -273,6 +273,11 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
return mDocument != null && mDocument.getDocumentType() ==
Document.DOCTYPE_TEXT;
}
+@Override
+public boolean isSpreadsheet() {
+return mDocument != null && mDocument.getDocumentType() ==
Document.DOCTYPE_SPREADSHEET;
+}
+
/**
* Register the tile invalidation callback.
*/
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
index 15332a7..1f15870 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
@@ -84,6 +84,11 @@ publ
[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 3 commits - android/experimental include/vcl sd/source
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 16 +++---
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|9 -
include/vcl/ITiledRenderable.hxx
|4 ++
sd/source/ui/inc/unomodel.hxx
|3 +
sd/source/ui/unoidl/unomodel.cxx
|5 +++
5 files changed, 31 insertions(+), 6 deletions(-)
New commits:
commit 3bccac71fb4f63305f5fd05b102ac287c235f8c9
Author: Jan Holesovsky
Date: Wed Feb 4 23:31:01 2015 +0100
android: When loading fails, make sure we don't crash the next time.
Until now, when the loading failed, the next attempt to open a document
lead to a crash; fixed.
Change-Id: Ibb55b4799169e1521f076cf38380e429a50258a3
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index fd88f1c..83cf5ec 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -28,6 +28,9 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
}
private void tileRequest(ComposedTileLayer composedTileLayer,
TileIdentifier tileId, boolean forceRedraw) {
+if (mTileProvider == null)
+return;
+
if (composedTileLayer.isStillValid(tileId)) {
CairoImage image = mTileProvider.createTile(tileId.x, tileId.y,
tileId.size, tileId.zoom);
if (image != null) {
@@ -43,6 +46,9 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
}
private void tileRerender(ComposedTileLayer composedTileLayer, SubTile
tile) {
+if (mTileProvider == null)
+return;
+
if (composedTileLayer.isStillValid(tile.id) && !tile.markedForRemoval)
{
mLayerClient.beginDrawing();
mTileProvider.rerenderTile(tile.getImage(), tile.id.x, tile.id.y,
tile.id.size, tile.id.zoom);
@@ -90,7 +96,7 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
LOKitShell.hideProgressSpinner();
}
-private boolean loadDocument(String filename) {
+private void loadDocument(String filename) {
if (mApplication == null) {
mApplication = LibreOfficeMainActivity.mAppContext;
}
@@ -98,19 +104,21 @@ public class LOKitThread extends Thread implements
TileProvider.TileInvalidation
mLayerClient = mApplication.getLayerClient();
mTileProvider = TileProviderFactory.create(mLayerClient, filename);
-boolean isReady = mTileProvider.isReady();
-if (isReady) {
+
+if (mTileProvider.isReady()) {
LOKitShell.showProgressSpinner();
mTileProvider.registerInvalidationCallback(this);
refresh();
LOKitShell.hideProgressSpinner();
+} else {
+closeDocument();
}
-return isReady;
}
public void closeDocument() {
if (mTileProvider != null) {
mTileProvider.close();
+mTileProvider = null;
}
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index c9e74c5..c39609d 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -75,6 +75,9 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
postLoad();
mIsReady = true;
}
+else {
+mIsReady = false;
+}
}
public void postLoad() {
@@ -149,7 +152,7 @@ public class LOKitTileProvider implements TileProvider,
Document.MessageCallback
} else {
ret = resetDocumentSize();
if (!ret) {
-error = "Document returned an invalid size or the document is
empty!";
+error = "Document returned an invalid size or the document is
empty.";
}
}
commit 19c6379f2d4aa67d45e3c6235474e7e919b94f46
Author: Jan Holesovsky
Date: Wed Feb 4 20:33:52 2015 +0100
android: Initialize for tiled rendering earlier.
We need to prepare the document ASAP, otherwise we will get zero size when
eg.
presentation is switched to Notes view.
Change-Id: I0d3ccea18058052994d91868ec1346c5de25faff
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 3760891..c9e74c5 100644
---
a/android/experime
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xeextlst.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit e98b6027458dd9410e27c5f273f4db5cc1443b01 Author: Katarina Behrens Date: Wed Feb 4 22:43:31 2015 +0100 Seems that BS() does something else than I thought XclXmlUtils::ToPsz is the one I needed Change-Id: If4aee9a2a9c943535d7e07b08f61b419ac2c8a22 diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index 9015672..c621c24 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -14,7 +14,6 @@ #include "xename.hxx" #include "xecontent.hxx" #include "tokenarray.hxx" -#include using namespace ::oox; @@ -151,7 +150,7 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream& rStrm ) XML_minLength, OString::number(0).getStr(), XML_maxLength, OString::number(100).getStr(), XML_axisPosition, getAxisPosition(meAxisPosition), -XML_gradient, BS(mbGradient), +XML_gradient, XclXmlUtils::ToPsz(mbGradient), FSEND ); mpLowerLimit->SaveXml( rStrm ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/inc/workctrl.hxx| 13 ++---
sw/source/uibase/ribbar/workctrl.cxx |6 +++---
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 535f34bba60e06d390a6f3802072b16a9841bc4e
Author: Caolán McNamara
Date: Wed Feb 4 21:04:44 2015 +
Resolves: tdf#Crash when clicking the Reminder icon on the Navigation
toolbar
the Parent window isn't a SwScrollNaviPopup anymore
Change-Id: I5c539d125aac28bfee0beb842ff2df001e19c945
diff --git a/sw/source/uibase/inc/workctrl.hxx
b/sw/source/uibase/inc/workctrl.hxx
index 493b164..6bb9c1f 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -110,14 +110,21 @@ public:
DECL_LINK(PopupHdl, PopupMenu*);
};
+class SwScrollNaviPopup;
+
class SwScrollNaviToolBox : public ToolBox
{
+SwScrollNaviPopup *m_pNaviPopup;
+
virtual voidMouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual voidRequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
-public:
-SwScrollNaviToolBox(vcl::Window* pParent, WinBits nWinStyle ) :
-ToolBox(pParent, nWinStyle ) {}
+public:
+SwScrollNaviToolBox(vcl::Window* pParent, SwScrollNaviPopup* pNaviPopup,
WinBits nWinStyle)
+: ToolBox(pParent, nWinStyle)
+, m_pNaviPopup(pNaviPopup)
+{
+}
};
class SwScrollNaviPopup : public SfxPopupWindow
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index 5317632..09ee4a3 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -394,7 +394,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const
Reference< XFrame >&
"modules/swriter/ui/floatingnavigation.ui", rFrame),
aIList(SW_RES(IL_VALUES))
{
-m_pToolBox = new SwScrollNaviToolBox(get("box"), 0);
+m_pToolBox = new SwScrollNaviToolBox(get("box"), this, 0);
get(m_pInfoField, "label");
sal_uInt16 i;
@@ -502,8 +502,8 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
{
ToolBox::MouseButtonUp(rMEvt);
-if ( static_cast(GetParent())->IsInPopupMode() )
-static_cast(GetParent())->EndPopupMode(
FLOATWIN_POPUPMODEEND_CLOSEALL );
+if (m_pNaviPopup->IsInPopupMode())
+m_pNaviPopup->EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL);
}
void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source include/framework sfx2/source
framework/source/classes/menumanager.cxx |8 -
framework/source/fwe/classes/addonmenu.cxx|4
framework/source/fwe/classes/bmkmenu.cxx |4
framework/source/fwe/xml/menuconfiguration.cxx| 12 +-
framework/source/uielement/menubarmanager.cxx | 12 +-
framework/source/uielement/newmenucontroller.cxx |8 -
framework/source/uielement/popuptoolbarcontroller.cxx |4
include/framework/menuconfiguration.hxx | 88 +-
sfx2/source/menu/mnuitem.cxx |8 -
sfx2/source/menu/virtmenu.cxx | 12 +-
10 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit af6cd2356afd1212acc529f796f8043ad7e278e6
Author: Caolán McNamara
Date: Wed Feb 4 20:46:57 2015 +
rename MenuConfiguration::Attributes->MenuAttributes
Change-Id: I2ada1394c4cbee7c27b02f241ee4a254597a5dd8
diff --git a/framework/source/classes/menumanager.cxx
b/framework/source/classes/menumanager.cxx
index c09cc87..b9350ef 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -219,8 +219,8 @@ MenuManager::MenuManager(
Image aImage;
OUString aImageId;
-MenuConfiguration::Attributes* pMenuAttributes =
-
reinterpret_cast(pMenu->GetUserValue( nItemId
));
+MenuAttributes* pMenuAttributes =
+
reinterpret_cast(pMenu->GetUserValue( nItemId ));
if ( pMenuAttributes &&
!pMenuAttributes->aImageId.isEmpty() )
{
@@ -944,8 +944,8 @@ void MenuManager::FillMenuImages(Reference< XFrame >&
_xFrame, Menu* _pMenu,bool
boolbImageSet = false;
OUString aImageId;
-::framework::MenuConfiguration::Attributes* pMenuAttributes =
-reinterpret_cast<
::framework::MenuConfiguration::Attributes*>(_pMenu->GetUserValue( nId ));
+::framework::MenuAttributes* pMenuAttributes =
+reinterpret_cast<
::framework::MenuAttributes*>(_pMenu->GetUserValue( nId ));
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id
from menu attributes
diff --git a/framework/source/fwe/classes/addonmenu.cxx
b/framework/source/fwe/classes/addonmenu.cxx
index 54c1fa9..5161e62 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -330,8 +330,8 @@ void AddonMenuManager::BuildMenu( PopupMenu*
pCurrent
// Store values from configuration to the New and Wizard menu
entries to enable
// sfx2 based code to support high contrast mode correctly!
-sal_uIntPtr nAttributePtr =
MenuConfiguration::Attributes::CreateAttribute(aTarget, aImageId);
-pCurrentMenu->SetUserValue(nId, nAttributePtr,
MenuConfiguration::Attributes::ReleaseAttribute);
+sal_uIntPtr nAttributePtr =
MenuAttributes::CreateAttribute(aTarget, aImageId);
+pCurrentMenu->SetUserValue(nId, nAttributePtr,
MenuAttributes::ReleaseAttribute);
pCurrentMenu->SetItemCommand( nId, aURL );
if ( pSubMenu )
diff --git a/framework/source/fwe/classes/bmkmenu.cxx
b/framework/source/fwe/classes/bmkmenu.cxx
index a3f4290..cc9c31f 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -164,8 +164,8 @@ void BmkMenu::Initialize()
else
InsertItem( nId, aTitle );
-sal_uIntPtr nAttributePtr =
MenuConfiguration::Attributes::CreateAttribute(aTargetFrame, aImageId);
-SetUserValue(nId, nAttributePtr,
MenuConfiguration::Attributes::ReleaseAttribute);
+sal_uIntPtr nAttributePtr =
MenuAttributes::CreateAttribute(aTargetFrame, aImageId);
+SetUserValue(nId, nAttributePtr, MenuAttributes::ReleaseAttribute);
SetItemCommand( nId, aURL );
}
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx
b/framework/source/fwe/xml/menuconfiguration.cxx
index aabbc47..1d2a8dd 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -139,25 +139,25 @@ void MenuConfiguration::StoreMenuBarConfigurationToXML(
}
}
-sal_uIntPtr MenuConfiguration::Attributes::CreateAttribute(const OUString&
rFrame, const OUString& rImageIdStr)
+sal_uIntPtr MenuAttributes::CreateAttribute(const OUString& rFrame, const
OUString& rImageIdStr)
{
-Attributes* pAttributes = new Attributes(rFrame, rImageIdStr);
+MenuAttributes* pAttributes = new MenuAttributes(rFrame, rImageIdStr);
pAttributes->acquire();
return reinterpret_cast(pAttributes);
}
-sal_uIntPtr MenuConfigur
[Libreoffice-commits] core.git: 2 commits - dbaccess/source sw/source unusedcode.easy
dbaccess/source/ui/inc/TableController.hxx |4
dbaccess/source/ui/tabledesign/TEditControl.cxx| 20
dbaccess/source/ui/tabledesign/TEditControl.hxx|3 ---
dbaccess/source/ui/tabledesign/TableController.cxx | 11 ---
sw/source/ui/fldui/javaedit.cxx|7 ++-
unusedcode.easy|5 -
6 files changed, 6 insertions(+), 44 deletions(-)
New commits:
commit 38a65f76bc944ea730ebac7640dc135248ec3da0
Author: Caolán McNamara
Date: Wed Feb 4 17:11:14 2015 +
Resolves: fdo#68137 crash in traversing script fields
use the same guards as the SwFldEditDlg does
Change-Id: I7d135cf969d9925cec57a90ef0fba8fe40f664eb
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index e67d532..0e27086 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -73,7 +73,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent,
SwWrtShell* pWrtSh) :
aFont.SetWeight( WEIGHT_LIGHT );
m_pEditED->SetFont( aFont );
-pMgr = new SwFldMgr;
+pMgr = new SwFldMgr(pSh);
pFld = static_cast(pMgr->GetCurFld());
bNew = !(pFld && pFld->GetTyp()->Which() == RES_SCRIPTFLD);
@@ -88,6 +88,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent,
SwWrtShell* pWrtSh) :
SwJavaEditDialog::~SwJavaEditDialog()
{
+pSh->EnterStdMode();
delete pMgr;
delete pFileDlg;
Application::SetDefDialogParent( pOldDefDlgParent );
@@ -95,6 +96,8 @@ SwJavaEditDialog::~SwJavaEditDialog()
IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
{
+pSh->EnterStdMode();
+
SetFld();
pMgr->GoPrev();
pFld = static_cast(pMgr->GetCurFld());
@@ -107,6 +110,8 @@ IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl)
IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
{
+pSh->EnterStdMode();
+
SetFld();
pMgr->GoNext();
pFld = static_cast(pMgr->GetCurFld());
commit 7e1eb03a39b776adf0f479e2801214b1e2d0f6cc
Author: Caolán McNamara
Date: Wed Feb 4 17:15:02 2015 +
callcatcher: remove some more recently discovered unused methods
Change-Id: Ib01e444b24ad9288970066a47f3fcf3dbee1fc49
diff --git a/dbaccess/source/ui/inc/TableController.hxx
b/dbaccess/source/ui/inc/TableController.hxx
index d44aa34..578eb99 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -133,10 +133,6 @@ namespace dbaui
static ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >
SAL_CALL Create(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&);
-
-void Load(const ::com::sun::star::uno::Reference<
::com::sun::star::io::XObjectInputStream>& _rxIn);
-void Save(const ::com::sun::star::uno::Reference<
::com::sun::star::io::XObjectOutputStream>& _rxOut);
-
protected:
void startTableListening();
void stopTableListening();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index ce169f3..ad3e528 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -129,15 +129,6 @@ void OTableEditorCtrl::Init()
RowInserted(0, m_pRowList->size(), true);
}
-void OTableEditorCtrl::UpdateAll()
-{
-RowRemoved(0, GetRowCount(), false);
-m_nDataPos = 0;
-
-InvalidateFeatures();
-Invalidate();
-}
-
OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow)
:OTableRowView(pWindow)
,pNameCell(NULL)
@@ -716,17 +707,6 @@ void OTableEditorCtrl::InvalidateFeatures()
GetView()->getController().InvalidateFeature(SID_SAVEDOC);
}
-void OTableEditorCtrl::Undo()
-{
-
-InvalidateFeatures();
-}
-
-void OTableEditorCtrl::Redo()
-{
-InvalidateFeatures();
-}
-
void OTableEditorCtrl::CopyRows()
{
// set to the right row and save it
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx
b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index cd9f73b..bfae245 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -100,8 +100,6 @@ namespace dbaui
virtual void CellModified() SAL_OVERRIDE;
virtual bool SaveModified() SAL_OVERRIDE; // is called before changing
a cell (false prevents change)
-void Undo();
-void Redo();
virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const
SAL_OVERRIDE;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId)
SAL_OVERRIDE;
@@ -125,7 +123,6 @@ namespace dbaui
OTableEditorCtrl(vcl::Window* pParentWin);
virtual ~OTableEditorCtrl();
virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol)
SAL_OVERRIDE;
-void UpdateAll();
SfxUndoManager& GetUndoManager() const;
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +- sc/source/core/tool/calcconfig.cxx |4 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit cf726ae8514ce9ad8f8a88e2de06a67850543fef Author: Tor Lillqvist Date: Wed Feb 4 21:30:59 2015 +0200 Add Add, Sub, Mul and Div back to the default OpenCL opcode subset The code falls back to the traditional interpreter when necessary. This reverts commit ad582ce757f671a6271648e22a136f2d238cc15e. Change-Id: I4cbafba2c469c0814dcc5c5210db5ce495e6b641 diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 7ef9afb..5966b0b 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1373,7 +1373,7 @@ true, and a formula contains only these operators and functions, it might be calculated using OpenCL. - RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;SUMIFS + +;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;SUMIFS diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 4e9292a..0023910 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -41,6 +41,10 @@ void ScCalcConfig::setOpenCLConfigToDefault() // Keep in order of opcode value, is that clearest? (Random order, // at least, would make no sense at all.) +maOpenCLSubsetOpCodes.insert(ocAdd); +maOpenCLSubsetOpCodes.insert(ocSub); +maOpenCLSubsetOpCodes.insert(ocMul); +maOpenCLSubsetOpCodes.insert(ocDiv); maOpenCLSubsetOpCodes.insert(ocRandom); maOpenCLSubsetOpCodes.insert(ocSin); maOpenCLSubsetOpCodes.insert(ocCos); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/inc sc/source
sc/inc/formulacell.hxx |4
sc/inc/tokenarray.hxx |3 +++
sc/source/core/data/formulacell.cxx | 13 -
sc/source/core/tool/token.cxx | 27 +++
4 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit 3c50f98dc266b42ffe9cdc8843d21e4a47a16bcb
Author: Tor Lillqvist
Date: Wed Feb 4 16:19:38 2015 +0200
Check number of cells referenced by group instead of group size
Put using it in #if 0 for now, though.
This reverts commit 1fd902d4b851c534cf7473dd13983fc2c46500ed
Change-Id: I7bb3efdc594bf7f1a61b037bf3488dae4ca119c9
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 86b8045..746ca550 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -410,6 +410,10 @@ public:
bool IsSharedTop() const;
SCROW GetSharedTopRow() const;
SCROW GetSharedLength() const;
+
+// An estimate of the number of cells referenced by the formula
+sal_Int32 GetWeight() const;
+
ScTokenArray* GetSharedCode();
const ScTokenArray* GetSharedCode() const;
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 07f344b..ad61ef3 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -59,6 +59,9 @@ public:
virtual ~ScTokenArray();
ScTokenArray* Clone() const;/// True copy!
+// An estimate of the number of cells referenced by the token array
+sal_Int32 GetWeight() const;
+
void GenHash();
size_t GetHash() const { return mnHashValue;}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index bc9ffbe..98bb568 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3750,7 +3750,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
if (mxGroup->meCalcState == sc::GroupCalcDisabled)
return false;
-if (GetSharedLength() <
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
+if (GetWeight() <
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
{
mxGroup->meCalcState = sc::GroupCalcDisabled;
return false;
@@ -4128,6 +4128,17 @@ SCROW ScFormulaCell::GetSharedLength() const
return mxGroup ? mxGroup->mnLength : 0;
}
+sal_Int32 ScFormulaCell::GetWeight() const
+{
+#if 0
+if (!mxGroup)
+return pCode->GetWeight();
+return GetSharedLength() * GetSharedCode()->GetWeight();
+#else
+return GetSharedLength();
+#endif
+}
+
ScTokenArray* ScFormulaCell::GetSharedCode()
{
return mxGroup ? mxGroup->mpCode : NULL;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8816b87..ee55b07 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1412,6 +1412,33 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange,
const ScAddress& rPos, boo
return bIs;
}
+sal_Int32 ScTokenArray::GetWeight() const
+{
+sal_Int32 result(1);
+
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_cast(nLen);
+for (; p != pEnd; ++p)
+{
+switch ((*p)->GetType())
+{
+case svDoubleRef :
+case svExternalDoubleRef:
+{
+const ScComplexRefData& rRef = *(*p)->GetDoubleRef();
+result += ( (rRef.Ref2.Row() - rRef.Ref1.Row() + 1) *
(rRef.Ref2.Col() - rRef.Ref1.Col() + 1) );
+}
+break;
+default:
+break;
+}
+}
+// Just print out the this pointer. It turns out to be quite complicated
to get
+// a symbolic printout of the ScTokenArray here.
+SAL_INFO("sc.token", "GetWeight(" << this << "): " << result);
+return result;
+}
+
namespace {
// we want to compare for similar not identical formulae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/formulacell.hxx |4
sc/inc/tokenarray.hxx |3 +++
sc/source/core/data/formulacell.cxx | 13 -
sc/source/core/tool/token.cxx | 27 +++
4 files changed, 46 insertions(+), 1 deletion(-)
New commits:
commit fab297c7945b51964627aa16a0b0019442d27a66
Author: Tor Lillqvist
Date: Wed Feb 4 16:19:38 2015 +0200
Check number of cells referenced by group instead of group size
Put using it in #if 0 for now, though.
This reverts commit 2021275f8fc33d9917d5fef58959a95da1dc7e6f.
Change-Id: Ia6541df12ee97747badbbedd758873688190b00c
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 3803a46..c3a8f0e 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -411,6 +411,10 @@ public:
bool IsSharedTop() const;
SCROW GetSharedTopRow() const;
SCROW GetSharedLength() const;
+
+// An estimate of the number of cells referenced by the formula
+sal_Int32 GetWeight() const;
+
ScTokenArray* GetSharedCode();
const ScTokenArray* GetSharedCode() const;
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 5d6593d..ab1e941 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -60,6 +60,9 @@ public:
virtual ~ScTokenArray();
ScTokenArray* Clone() const;/// True copy!
+// An estimate of the number of cells referenced by the token array
+sal_Int32 GetWeight() const;
+
void GenHash();
size_t GetHash() const { return mnHashValue;}
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 3939c04..d591870 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3766,7 +3766,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
if (mxGroup->meCalcState == sc::GroupCalcDisabled)
return false;
-if (GetSharedLength() <
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
+if (GetWeight() <
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
{
mxGroup->meCalcState = sc::GroupCalcDisabled;
return false;
@@ -4144,6 +4144,17 @@ SCROW ScFormulaCell::GetSharedLength() const
return mxGroup ? mxGroup->mnLength : 0;
}
+sal_Int32 ScFormulaCell::GetWeight() const
+{
+#if 0
+if (!mxGroup)
+return pCode->GetWeight();
+return GetSharedLength() * GetSharedCode()->GetWeight();
+#else
+return GetSharedLength();
+#endif
+}
+
ScTokenArray* ScFormulaCell::GetSharedCode()
{
return mxGroup ? mxGroup->mpCode : NULL;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 4312f55..e7e6ece 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1417,6 +1417,33 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange,
const ScAddress& rPos, boo
return bIs;
}
+sal_Int32 ScTokenArray::GetWeight() const
+{
+sal_Int32 result(1);
+
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_cast(nLen);
+for (; p != pEnd; ++p)
+{
+switch ((*p)->GetType())
+{
+case svDoubleRef :
+case svExternalDoubleRef:
+{
+const ScComplexRefData& rRef = *(*p)->GetDoubleRef();
+result += ( (rRef.Ref2.Row() - rRef.Ref1.Row() + 1) *
(rRef.Ref2.Col() - rRef.Ref1.Col() + 1) );
+}
+break;
+default:
+break;
+}
+}
+// Just print out the this pointer. It turns out to be quite complicated
to get
+// a symbolic printout of the ScTokenArray here.
+SAL_INFO("sc.token", "GetWeight(" << this << "): " << result);
+return result;
+}
+
namespace {
// we want to compare for similar not identical formulae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/llunak/munich_12587'
New branch 'private/llunak/munich_12587' available with the following commits: commit 4fe21d490b073a970364eaaff830d5734975124a Author: LuboÅ¡ LuÅák Date: Wed Feb 4 19:39:52 2015 +0100 discard excessive (X11) autorepeat keyboard events if they overload LO If e.g. a document is slow to redraw, scrolling it by holding down a key such as PageDown can make LO lag behind and continue processing the queued up input events even (long) after the key has been released. Since with autorepeat keyboard events the normal user expectations are to hold it until something happens and the exact number of the events doesn't matter, simply discard excessive autorepeat keyboard events if LO can't keep up with them. (cherry picked from commit fc29d34dc60dda5ddbc8f0444684bd2f4eb3668e) Change-Id: I45acdc9aa5033647fb80760991437dddfcb6591c commit cedee021e45ddd0655e9cb791cf706ab4ef042af Author: LuboÅ¡ LuÅák Date: Wed Feb 4 19:37:27 2015 +0100 compress (X11) mouse wheel events There is one event per wheel step, so wheeling more can create a number of wheel events, and LO processed those one by one. If processing one took long (e.g. the repaint was complicated), the scrolling visibly lagged. This commit works only for X11 VCL backend (and by extension, KDE3/4 backends). (cherry picked from commit 847513d409b146400515d7796d196b8b2a142036) Change-Id: I5eff7446da16167ec75925e75243314c68bc81a4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-design] Re: [libreoffice-projects] minutes of ESC call ...
Writer: - Implement Image crop tool similar to the one present in Impress, Sidebar: - Implement an "Insert" subcategory in the Properties tab of the Sidebar in Writer/Calc/Excel, - Implement a "Data" subcategory in the Properties tab of the Sidebar in Calc, General - Allow to use different shapes in cropped images in Writer/Impress/Draw (besides the rectangle) - similar to Google Docs. On Wed, Feb 4, 2015 at 9:47 AM, Noel Grandin wrote: > > > On 2015-02-01 02:05 PM, Michel Renon wrote: > >> >> here are some ideas : if you think some might be interesting, tell me and >> I'll make some specs/ux design >> > > Those are some very good ideas! Even if they don't make the GSOC, they > should probably be logged in bugzilla. > > > -- > To unsubscribe e-mail to: design+unsubscr...@global.libreoffice.org > Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to- > unsubscribe/ > Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette > List archive: http://listarchives.libreoffice.org/global/design/ > All messages sent to this list will be publicly archived and cannot be > deleted > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - desktop/source include/LibreOfficeKit ios/CustomTarget_TiledLibreOffice_app.mk ios/experimental
desktop/source/app/officeipcthread.cxx |
24 +++-
desktop/source/app/sofficemain.cxx |
12 --
desktop/source/lib/init.cxx |
21 +++
include/LibreOfficeKit/LibreOfficeKitInit.h |
12 +-
ios/CustomTarget_TiledLibreOffice_app.mk |
13 +-
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
20 +--
ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m |
53 +-
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h |
5
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |
21 ++-
ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h|
3
ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m|
21 ++-
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |
5
12 files changed, 114 insertions(+), 96 deletions(-)
New commits:
commit 4b269ecb7a699318b067eb64c464460b1783d3d2
Author: Tor Lillqvist
Date: Wed Feb 4 17:48:41 2015 +0100
Use LibreOfficeKit in the TiledLibreOffice iOS demo app, too
For iOS, the pBuffer argument to LibreOfficeKitDocument::paintTile()
is not a pixel buffer, but a CGContextRef. Thus we can keep the
existing CGContext-oriented vcl code for iOS as is.
I commented out the -using code in sw, and it probably
would be OK to just kill and remove use and
implementations of its API. I don't think they are used by our current
Android or iOS code.
This concludes the commits of the work I did at the post-FOSDEM
hackfest and on the flight home. TiledLibreOffice now works as before,
but uses LibreOfficeKit.
Change-Id: Ibbde6e11d660561840eab6335f7fc0db6758173e
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 58fa25a..c5f2367 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -449,12 +449,12 @@ void OfficeIPCThread::RequestsCompleted( int nCount )
OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
{
-#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
::osl::MutexGuard aGuard( GetMutex() );
if( pGlobalOfficeIPCThread.is() )
return IPC_STATUS_OK;
+#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
OUString aUserInstallPath;
OUString aDummy;
@@ -605,14 +605,15 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
return IPC_STATUS_2ND_OFFICE;
}
#else
-pGlobalOfficeIPCThread = rtl::Reference< OfficeIPCThread >(new
OfficeIPCThread);
+rtl::Reference< OfficeIPCThread > pThread(new OfficeIPCThread);
+pGlobalOfficeIPCThread = pThread;
+pThread->launch();
#endif
return IPC_STATUS_OK;
}
void OfficeIPCThread::DisableOfficeIPCThread(bool join)
{
-#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
osl::ClearableMutexGuard aMutex( GetMutex() );
if( pGlobalOfficeIPCThread.is() )
@@ -635,9 +636,6 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
pOfficeIPCThread->join();
}
}
-#else
- (void) join;
-#endif
}
OfficeIPCThread::OfficeIPCThread() :
@@ -967,6 +965,20 @@ void OfficeIPCThread::execute()
salhelper::Thread::wait( tval );
}
} while( schedule() );
+#else
+
+#if 0 // Seems to work fine to let this thread just die?
+
+// Not sure what to do, so wait forever. Note that on iOS (or
+// Android, but in this case ANDROID is handled like DESKTOP, see
+// above) an app never exits voluntarily, but is always killed by
+// the system when its resources are needed.)
+TimeValue tval;
+tval.Seconds = 10;
+tval.Nanosec = 0;
+salhelper::Thread::wait( tval );
+#endif
+
#endif
}
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index 9cee2c4..0597a4f 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -49,10 +49,6 @@
# define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOGTAG,
__VA_ARGS__))
#endif
-#ifdef IOS
-#include
-#endif
-
extern "C" int DESKTOP_DLLPUBLIC soffice_main()
{
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
@@ -114,22 +110,16 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
extern "C" SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_android_AppSupport_runMain(JNIEnv* /* env */,
jobject /* clazz */)
-#else
-extern "C"
-void
-touch_lo_runMain()
-#endif
{
int nRet;
do {
nRet = soffice_main();
-#ifdef ANDROID
LOGI("soffice_main returned %d", nRet);
-#endif
} while (nRet == EXITHELPER_NORMAL_RESTART ||
nRet == EX
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/number.cxx | 10 ++
sw/source/core/docnode/nodedump.cxx | 12
2 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit a66950bb99069d5133ce28b48816148cc10b15d6
Author: Miklos Vajna
Date: Wed Feb 4 17:34:41 2015 +0100
Extract SwNumRule::dumpAsXml() from docnode
Change-Id: I4104f39227cb42d5cc2013c9ae0f4bb15e0f0f00
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index ab57814..163eda1 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -46,6 +46,7 @@
#include
#include
+#include
#include
@@ -1037,6 +1038,15 @@ void SwNumRule::RemoveParagraphStyle( SwTxtFmtColl&
rTxtFmtColl )
}
}
+void SwNumRule::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("swNumRule"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("msName"),
BAD_CAST(msName.toUtf8().getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mnPoolFmtId"),
BAD_CAST(OString::number(mnPoolFmtId).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("mbAutoRuleFlag"),
BAD_CAST(OString::boolean(mbAutoRuleFlag).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
void SwNumRule::GetGrabBagItem(uno::Any& rVal) const
{
if (mpGrabBagItem.get())
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index c9aa867..64ea367 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -373,18 +373,6 @@ void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr w) const
}
}
-void SwNumRule::dumpAsXml(xmlTextWriterPtr w) const
-{
- WriterHelper writer(w);
- writer.startElement("swnumrule");
- OString aName = OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8);
- writer.writeFormatAttribute("name", "%s", BAD_CAST(aName.getStr()));
- writer.writeFormatAttribute("isautorule", TMP_FORMAT, IsAutoRule() ? 1 :
0);
- if (GetPoolFmtId() != USHRT_MAX)
- writer.writeFormatAttribute("poolfmtid", TMP_FORMAT, GetPoolFmtId());
- writer.endElement();
-}
-
void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr w) const
{
if (!empty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/Bootstrap
android/Bootstrap/Makefile.shared |2 ++ 1 file changed, 2 insertions(+) New commits: commit c8f52f87ef7370a1847e362350dcdf6067e6b053 Author: Miklos Vajna Date: Wed Feb 4 17:45:00 2015 +0100 android: fix missing drawingML preset shapes Change-Id: I7a22b9bcacd26b837c00bb09743ab2e176d60746 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 77d2bcf..12b4774 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -138,6 +138,8 @@ copy-stuff: rm -Rf assets/share # pre-clean it mkdir -p assets/share/config cp -R $(INSTDIR)/share/registry assets/share +# Filter data is needed by e.g. the drawingML preset shape import. + cp -R $(INSTDIR)/share/filter assets/share # Make sure the soffice.cfg directory is always created, it's not possible to hit any keys without it. if ! test z$(DISABLE_UI) = zTRUE; then \ echo "Copying UI files into the apk"; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/Module_connectivity.mk Repository.mk
Repository.mk | 17 - connectivity/Module_connectivity.mk |8 +--- 2 files changed, 9 insertions(+), 16 deletions(-) New commits: commit 0cbe2e92a24be1354f9b058b6584aaed40ddb6ce Author: Michael Stahl Date: Wed Feb 4 17:29:23 2015 +0100 connectivity: just check the WITH_MOZAB4WIN variable Either build mozab or mork driver, and install it in Repository.mk too. Change-Id: I456d6cb4ebe99625a64a960d1133cb06d836e8c7 diff --git a/Repository.mk b/Repository.mk index 8f948a5..095dfba 100644 --- a/Repository.mk +++ b/Repository.mk @@ -460,20 +460,19 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xof \ xsltdlg \ xsltfilter \ + $(if $(WITH_MOZAB4WIN), \ + mozab2 \ + mozabdrv \ + ) \ + $(if $(WITH_MOZAB4WIN),,\ + mork \ + mozbootstrap \ + ) \ $(if $(filter $(OS),WNT), \ ado \ $(if $(DISABLE_ATL),,oleautobridge) \ smplmail \ wininetbe1 \ - $(if $(WITH_MOZAB4WIN), \ - mozab2 \ - mozabdrv \ - ) \ - $(if $(WITH_MOZAB4WIN),,mozbootstrap) \ - ) \ - $(if $(filter $(OS),WNT),, \ - mork \ - mozbootstrap \ ) \ $(if $(filter $(OS),MACOSX), \ $(if $(ENABLE_MACOSX_SANDBOX),, \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 1ba9e7b..4616eb3 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -102,19 +102,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(OS)-$(CPUNAME),WNT-INTEL) - ifneq ($(WITH_MOZAB4WIN),) + $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_mozab \ Library_mozab \ Library_mozabdrv \ )) -else -$(eval $(call gb_Module_add_targets,connectivity,\ - Library_mozbootstrap \ -)) -endif else ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source include/framework include/vcl vcl/source
framework/inc/uielement/newmenucontroller.hxx|4 --
framework/source/fwe/classes/addonmenu.cxx |6 +--
framework/source/fwe/classes/bmkmenu.cxx |4 +-
framework/source/fwe/xml/menuconfiguration.cxx | 22 ++
framework/source/uielement/menubarmanager.cxx|5 +--
framework/source/uielement/newmenucontroller.cxx | 31 ++-
include/framework/menuconfiguration.hxx | 36 +++
include/vcl/menu.hxx |6 ++-
vcl/source/window/menu.cxx | 11 +--
vcl/source/window/menuitemlist.cxx |2 +
vcl/source/window/menuitemlist.hxx |5 ++-
11 files changed, 92 insertions(+), 40 deletions(-)
New commits:
commit 4904180247c0d5745a393e3cd57eaae29f3837e5
Author: Caolán McNamara
Date: Wed Feb 4 14:02:41 2015 +
fix leak from framework::AddonMenuManager::BuildMenu
provide a callback when a menu item gets deleted
Change-Id: I5b5f1a181fb10f53f6b1fe7b5637d385e1517530
diff --git a/framework/inc/uielement/newmenucontroller.hxx
b/framework/inc/uielement/newmenucontroller.hxx
index ad802fa..a86d5ad 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -81,9 +81,6 @@ namespace framework
private:
virtual void impl_setPopupMenu() SAL_OVERRIDE;
-typedef MenuConfiguration::Attributes AddInfo;
-
-typedef std::unordered_map< int, std::unique_ptr >
AddInfoForId;
void fillPopupMenu( com::sun::star::uno::Reference<
com::sun::star::awt::XPopupMenu >& rPopupMenu );
void retrieveShortcutsFromConfiguration( const
::com::sun::star::uno::Reference<
::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
@@ -99,7 +96,6 @@ namespace framework
m_bNewMenu: 1,
m_bModuleIdentified : 1,
m_bAcceleratorCfg : 1;
-AddInfoForIdm_aAddInfoForItem;
OUString m_aTargetFrame;
OUString m_aModuleIdentifier;
OUString m_aEmptyDocURL;
diff --git a/framework/source/fwe/classes/addonmenu.cxx
b/framework/source/fwe/classes/addonmenu.cxx
index 460104a..54c1fa9 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -58,10 +58,7 @@ AddonMenu::~AddonMenu()
{
if ( GetItemType( i ) != MenuItemType::SEPARATOR )
{
-// delete user attributes created with new!
sal_uInt16 nId = GetItemId( i );
-MenuConfiguration::Attributes* pUserAttributes =
reinterpret_cast(GetUserValue( nId ));
-delete pUserAttributes;
delete GetPopupMenu( nId );
}
}
@@ -333,7 +330,8 @@ void AddonMenuManager::BuildMenu( PopupMenu*
pCurrent
// Store values from configuration to the New and Wizard menu
entries to enable
// sfx2 based code to support high contrast mode correctly!
-pCurrentMenu->SetUserValue( nId, sal_uIntPtr( new
MenuConfiguration::Attributes( aTarget, aImageId )) );
+sal_uIntPtr nAttributePtr =
MenuConfiguration::Attributes::CreateAttribute(aTarget, aImageId);
+pCurrentMenu->SetUserValue(nId, nAttributePtr,
MenuConfiguration::Attributes::ReleaseAttribute);
pCurrentMenu->SetItemCommand( nId, aURL );
if ( pSubMenu )
diff --git a/framework/source/fwe/classes/bmkmenu.cxx
b/framework/source/fwe/classes/bmkmenu.cxx
index bf1396b..a3f4290 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -164,8 +164,8 @@ void BmkMenu::Initialize()
else
InsertItem( nId, aTitle );
-MenuConfiguration::Attributes* pUserAttributes = new
MenuConfiguration::Attributes( aTargetFrame, aImageId );
-SetUserValue( nId, reinterpret_cast(pUserAttributes)
);
+sal_uIntPtr nAttributePtr =
MenuConfiguration::Attributes::CreateAttribute(aTargetFrame, aImageId);
+SetUserValue(nId, nAttributePtr,
MenuConfiguration::Attributes::ReleaseAttribute);
SetItemCommand( nId, aURL );
}
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx
b/framework/source/fwe/xml/menuconfiguration.cxx
index 8eb6a6d..aabbc47 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -139,6 +139,28 @@ void MenuConfiguration::StoreMenuBarConfigurationToXML(
}
}
+sal_uIntPtr MenuConfiguration::Attributes::CreateAttribute(const OUString&
rFrame, const OUString& rImageIdStr)
+{
+Attributes* pAttributes = new Attributes(rFrame, rImageIdStr);
+pAttributes->acquire();
+return reinterpret_cast(pAttributes);
+}
+
+sal_uIntPtr Me
[Libreoffice-commits] core.git: 2 commits - connectivity/Module_connectivity.mk external/jpeg-turbo
connectivity/Module_connectivity.mk |6 +- external/jpeg-turbo/ExternalProject_jpeg-turbo.mk |2 +- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit 0c3505f01a792449b0c6bf81f518e7a062eea146 Author: Stephan Bergmann Date: Wed Feb 4 17:26:44 2015 +0100 Typo $(CPU) -> $(CPUNAME) Change-Id: I2e121c36021508bbdbc9111087f5cc6e1aae6524 diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 97310d1..1ba9e7b 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -102,7 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(OS)-$(CPU),WNT-INTEL) +ifeq ($(OS)-$(CPUNAME),WNT-INTEL) ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Module_add_targets,connectivity,\ diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk index ad35a6f..c913d70 100755 --- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk +++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_Externa $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) : $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ - --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPU)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ + --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ --with-pic \ --enable-static \ --disable-shared \ commit 484d5914575feb30146e0b75cef4860652805fa6 Author: Stephan Bergmann Date: Wed Feb 4 17:24:41 2015 +0100 Revert "Do not let WNT non-INTEL run into the else branch" This reverts commit c0f080403b869e162dc81db6c8c50b7360a3, logic error, true fix will follow. diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index ade21dd..97310d1 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -102,9 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(OS),WNT) - -ifeq ($(CPU),INTEL) +ifeq ($(OS)-$(CPU),WNT-INTEL) ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Module_add_targets,connectivity,\ @@ -118,8 +116,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -endif - else ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,connectivity,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/Module_connectivity.mk
connectivity/Module_connectivity.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit c0f080403b869e162dc81db6c8c50b7360a3 Author: Stephan Bergmann Date: Wed Feb 4 17:03:00 2015 +0100 Do not let WNT non-INTEL run into the else branch Change-Id: I85a5f35fb8b44734e84c686ecdffc6096226b91d diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 97310d1..ade21dd 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -102,7 +102,9 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(OS)-$(CPU),WNT-INTEL) +ifeq ($(OS),WNT) + +ifeq ($(CPU),INTEL) ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Module_add_targets,connectivity,\ @@ -116,6 +118,8 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif +endif + else ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,connectivity,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New Defects reported by Coverity Scan for LibreOffice
On 02/02/2015 04:28 PM, Lubos Lunak wrote: On Monday 02 of February 2015, Stephan Bergmann wrote: My take on it is simple: There /is/ a flaw in the above code, and Coverity /does/ correctly identify it. If the asserted condition cannot legitimately be false at that place, the ?: check is wrong and must go away. If it can, the assert is wrong and must go away (or, depending on context, be replaced with a SAL_WARN_IF, say). That is indeed the theory, but what is the reality? Can somebody with such a monstrous codebase say for sure which case it is for every instance of the problem? Nobody can for all of the codebase. But the author adding an assert in a specific place hopefully can for that instance. If memory serves me well, we shipped a couple of releases that under some circumstances had VCL KFileDialog integration hitting asserts on improper locking, but release builds still managed to cope with it somehow (more often than not, anyway). There must for sure be war stories providing evidence that "defensive programming" happened to exhibit desirable behavior on occasion. Developer builds should of course fall flat on their face in such cases, but in practice it's probably better to value end product stability more than practically insignificant warnings from a tool. That's probably where we are of different opinion, that IMO non-accidental stability can only arise from rigorousness. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/headless vcl/inc vcl/osx vcl/source vcl/unx vcl/win
include/vcl/timer.hxx |5 -
vcl/headless/svpinst.cxx|5 -
vcl/inc/saltimer.hxx|4
vcl/inc/salwtype.hxx|2
vcl/inc/unx/gtk/gtkdata.hxx |2
vcl/inc/unx/saldata.hxx |2
vcl/inc/unx/saldisp.hxx |1
vcl/inc/unx/salframe.h |1
vcl/osx/salinst.cxx |3
vcl/osx/salnstimer.mm |3
vcl/osx/saltimer.cxx|3
vcl/source/app/svapp.cxx|4
vcl/source/app/timer.cxx|4
vcl/unx/generic/app/saldata.cxx | 23 +
vcl/unx/generic/app/saltimer.cxx|4
vcl/unx/generic/window/salframe.cxx | 147
vcl/unx/gtk/app/gtkdata.cxx | 14 ++-
vcl/unx/kde4/KDEXLib.cxx|9 +-
vcl/unx/kde4/KDEXLib.hxx|1
vcl/win/source/app/saltimer.cxx |3
20 files changed, 189 insertions(+), 51 deletions(-)
New commits:
commit fc29d34dc60dda5ddbc8f0444684bd2f4eb3668e
Author: LuboÅ¡ LuÅák
Date: Wed Feb 4 15:25:03 2015 +0100
discard excessive (X11) autorepeat keyboard events if they overload LO
If e.g. a document is slow to redraw, scrolling it by holding down a key
such
as PageDown can make LO lag behind and continue processing the queued up
input events even (long) after the key has been released. Since with
autorepeat
keyboard events the normal user expectations are to hold it until something
happens and the exact number of the events doesn't matter, simply discard
excessive autorepeat keyboard events if LO can't keep up with them.
Change-Id: I45acdc9aa5033647fb80760991437dddfcb6591c
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index d7ce0c2..af89ba8 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -77,7 +77,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame,
public X11WindowProvider
X11SalGraphics *pGraphics_;// current frame graphics
X11SalGraphics *pFreeGraphics_;// first free frame graphics
-TimenReleaseTime_; // timestamp of last key release
sal_uInt16 nKeyCode_; // last key code
sal_uInt16 nKeyState_; // last key state
int nCompose_; // compose state
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 9dee672..77e70e7 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -778,7 +778,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong
nSalFrameStyle,
hCursor_= None;
nCaptured_ = 0;
- nReleaseTime_ = 0;
nKeyCode_ = 0;
nKeyState_ = 0;
nCompose_ = -1;
@@ -3157,6 +3156,66 @@ bool X11SalFrame::endUnicodeSequence()
long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
{
+if( pEvent->type == KeyRelease )
+{
+// Ignore autorepeat keyrelease events. If there is a series of
keypress+keyrelease+keypress events
+// generated by holding down a key, and if these are from autorepeat
(keyrelease and the following keypress
+// have the same timestamp), drop the autorepeat keyrelease event. Not
exactly sure why this is done
+// (possibly hiding differences between platforms, or just making it
more sensible, because technically
+// the key has not been released at all).
+bool ignore = false;
+// Discard queued excessive autorepeat events.
+// If the user presses and holds down a key, the autorepeating
keypress events
+// may overload LO (e.g. if the key is PageDown and the LO cannot keep
up scrolling).
+// Reduce the load by simply discarding such excessive events (so for
a KeyRelease event,
+// check if it's followed by matching KeyPress+KeyRelease pair(s) and
discard those).
+// This shouldn't have any negative effects - unlike with normal
(non-autorepeat
+// events), the user is unlikely to rely on the exact number of
resulting actions
+// (since autorepeat generates keypress events rather quickly and it's
hard to estimate
+// how many exactly) and the idea should be just keeping the key
pressed until something
+// happens (in which case more events that just lag LO shouldn't make
a difference).
+Display* dpy = pEvent->display;
+XKeyEvent previousRelease = *pEvent;
+while( XPending( dpy ))
+{
+XEvent nextEvent1;
+bool discard1 = false;
+XNextEvent( dpy, &nextEvent1 );
+if( nextEvent1.type == KeyPress && nextEvent1.xkey.time ==
previousRelease.time
+&& !nextEvent1.xkey.send_event && nextEvent1.xkey.window ==
previousRelease.window
+&& nextEvent
What is the reason for gb_Helper_abbreviate_dirs?
Asking because I see no good reason for it and it repeatedly gets in my way with its two major drawbacks: For one, it prevents use of '...' instead of "..." in certain places in recipes where the former would flow much more naturally from the fingers. For another, it makes it more tedious to copy/modify/paste "make" (w/o -s) output for some little one-off things like asking the compiler to produce -S instead of -c output for some .cxx. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac connectivity/Module_connectivity.mk
configure.ac|3 +++ connectivity/Module_connectivity.mk |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit e6a58b5e69b83e01b5291b1d8629927e05447797 Author: David Ostrovsky Date: Mon Feb 2 11:30:57 2015 +0100 Activate mork driver on windows 64 bit build On Windows 32 bit ancient seamonkey library is linked against libreoffice. In 64 bit we cannot used this library and we cannot recompile it because it was removed. Instead use mork driver. This would still meant functionality loss because Outlook and Outlook Express address book wouldn't be supported any more. Change-Id: I77fbb59aaeb6c7f3b6754e7ffb9172064155e8f3 Reviewed-on: https://gerrit.libreoffice.org/14275 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/configure.ac b/configure.ac index d83d4a8..0ffc61c 100644 --- a/configure.ac +++ b/configure.ac @@ -8639,6 +8639,9 @@ dnl === if test "$_os" = "WINNT"; then AC_MSG_CHECKING([whether to enable build of Mozilla addressbook connectivity driver for Windows]) if test "$enable_win_mozab_driver" = "yes" -a "$WITH_MINGW" != "YES" ; then +if test "$BITNESS_OVERRIDE" = 64; then + AC_MSG_ERROR([--with-win-mozab-driver and --enable-64-bit options are mutually exclusive]) +fi WITH_MOZAB4WIN=TRUE AC_MSG_RESULT([yes, internal (old windows mozab driver)]) BUILD_TYPE="$BUILD_TYPE MOZ" diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 46b030d..97310d1 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -102,7 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(OS),WNT) +ifeq ($(OS)-$(CPU),WNT-INTEL) ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Module_add_targets,connectivity,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/graphite
external/graphite/UnpackedTarball_graphite.mk |1
external/graphite/graphite2.win64.patch.1 | 47 ++
2 files changed, 48 insertions(+)
New commits:
commit 2bb5d4c840f95e5a3dd81122af479a9625db6dfc
Author: David Ostrovsky
Date: Tue Feb 3 14:58:11 2015 +0100
Fix graphite on windows 64 bit
Change-Id: I509fcf9194d3cc0d4454e31a9f7dfbb7f22c421c
Reviewed-on: https://gerrit.libreoffice.org/14316
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/external/graphite/UnpackedTarball_graphite.mk
b/external/graphite/UnpackedTarball_graphite.mk
old mode 100644
new mode 100755
index 4c4a0d0..c7fa86e
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
# http://projects.palaso.org/issues/1115
$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
external/graphite/graphite2.issue1115.patch.1 \
+external/graphite/graphite2.win64.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/graphite/graphite2.win64.patch.1
b/external/graphite/graphite2.win64.patch.1
new file mode 100755
index 000..6bf8c88
--- /dev/null
+++ b/external/graphite/graphite2.win64.patch.1
@@ -0,0 +1,47 @@
+diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h
+--- graphite.org/src/inc/json.h2015-02-03 14:49:24.408101900 +0100
graphite/src/inc/json.h2015-02-03 14:50:59.697552200 +0100
+@@ -78,6 +78,9 @@
+ json & operator << (string) throw();
+ json & operator << (number) throw();
+ json & operator << (integer) throw();
++#ifdef _WIN64
++json & operator << (size_t) throw();
++#endif
+ json & operator << (long unsigned int d) throw();
+ json & operator << (boolean) throw();
+ json & operator << (_null_t) throw();
+diff -ur graphite.org/src/json.cpp graphite/src/json.cpp
+--- graphite.org/src/json.cpp 2015-02-03 14:49:24.409102000 +0100
graphite/src/json.cpp 2015-02-03 14:50:49.814986900 +0100
+@@ -119,6 +119,9 @@
+ json & json::operator << (json::number f) throw() { context(seq);
fprintf(_stream, "%g", f); return *this; }
+ json & json::operator << (json::integer d) throw() { context(seq);
fprintf(_stream, "%ld", d); return *this; }
+ json & json::operator << (long unsigned d) throw() { context(seq);
fprintf(_stream, "%ld", d); return *this; }
++#ifdef _WIN64
++json & json::operator << (size_t d) throw() { context(seq);
fprintf(_stream, "%ld", d); return *this; }
++#endif
+ json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ?
"true" : "false", _stream); return *this; }
+ json & json::operator << (json::_null_t) throw(){ context(seq);
fputs("null",_stream); return *this; }
+
+diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp
+--- graphite.org/src/Pass.cpp 2015-02-03 14:49:24.413102200 +0100
graphite/src/Pass.cpp 2015-02-03 14:50:37.873303900 +0100
+@@ -466,7 +466,7 @@
+ {
+ if (r->rule->preContext > fsm.slots.context()) continue;
+ *fsm.dbgout << json::flat << json::object
+-<< "id" << r->rule - m_rules
++<< "id" << static_cast(r->rule - m_rules)
+ << "failed" << true
+ << "input" << json::flat << json::object
+ << "start" << objectid(dslot(&fsm.slots.segment,
input_slot(fsm.slots, -r->rule->preContext)))
+@@ -480,7 +480,7 @@
+ void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, const Rule &
r, Slot * const last_slot) const
+ {
+ *fsm.dbgout << json::item << json::flat << json::object
+-<< "id" << &r - m_rules
++<< "id" << static_cast(&r - m_rules)
+ << "failed" << false
+ << "input" << json::flat << json::object
+ << "start" << objectid(dslot(&fsm.slots.segment,
input_slot(fsm.slots, 0)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/jpeg-turbo
external/jpeg-turbo/ExternalProject_jpeg-turbo.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee457ab6304f16cdd76a9723368c314dc5a75c55 Author: David Ostrovsky Date: Tue Feb 3 13:13:55 2015 +0100 Fix jpeg-turbo on windows 64 bit This fix supports building jpeg-turbo on both cygwin 32 nd 64 bit. When only cygwin 64 bit is used, then it can be simplified by passing BUILD_PLATFORM to configure script on all platforms. Change-Id: Id335282f1761fcf7313fb18a6b9250e5eac392e4 Reviewed-on: https://gerrit.libreoffice.org/14315 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk old mode 100644 new mode 100755 index d9ac7e5..ad35a6f --- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk +++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_Externa $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) : $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ - --build=$(if $(filter WNT,$(OS)),i686-pc-cygwin,$(BUILD_PLATFORM)) \ + --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPU)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ --with-pic \ --enable-static \ --disable-shared \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/ring.hxx | 32
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 8b12e63b60530a2ad3769bc4983cc09bedd34c79
Author: Stephan Bergmann
Date: Wed Feb 4 14:08:40 2015 +0100
Don't downcast from Ring base class ctor/dtor to derived class T
...it is undefined behavior.
Change-Id: I16b66d4c5b98f54bf1a1c692c96b65f5b2d8084c
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 85f62bd..bfc9318 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -43,7 +43,7 @@ namespace sw
typedef RingContainer ring_container;
typedef RingContainer const_ring_container;
virtual ~Ring()
-{ algo::unlink(static_cast< value_type* >(this)); };
+{ algo::unlink(this); };
/**
* Removes this item from its current ring container and adds it to
* another ring container. If the item was not alone in the
original
@@ -65,8 +65,8 @@ namespace sw
* are alone in one.
*/
Ring()
-: pNext(static_cast< value_type* >(this))
-, pPrev(static_cast< value_type* >(this))
+: pNext(this)
+, pPrev(this)
{ }
/**
* Creates a new item and add it to an existing ring container.
@@ -76,16 +76,16 @@ namespace sw
Ring( value_type* pRing );
/** @return the next item in the ring container */
value_type* GetNextInRing()
-{ return pNext; }
+{ return static_cast(pNext); }
/** @return the previous item in the ring container */
value_type* GetPrevInRing()
-{ return pPrev; }
+{ return static_cast(pPrev); }
/** @return the next item in the ring container */
const_value_type* GetNextInRing() const
-{ return pNext; }
+{ return static_cast(pNext); }
/** @return the previous item in the ring container */
const_value_type* GetPrevInRing() const
-{ return pPrev; }
+{ return static_cast(pPrev); }
/** @return true if and only if this item is alone in its ring */
bool unique() const
{ return algo::unique(static_cast< const_value_type* >(this));
}
@@ -94,12 +94,12 @@ namespace sw
/** internal implementation class -- not for external use */
struct Ring_node_traits
{
-typedef value_type node;
-typedef value_type* node_ptr;
-typedef const value_type* const_node_ptr;
-static node_ptr get_next(const_node_ptr n) { return
const_cast(static_cast(n))->GetNextInRing(); };
+typedef Ring node;
+typedef Ring* node_ptr;
+typedef const Ring* const_node_ptr;
+static node_ptr get_next(const_node_ptr n) { return
const_cast(n)->pNext; };
static void set_next(node_ptr n, node_ptr next) { n->pNext =
next; };
-static node_ptr get_previous(const_node_ptr n) { return
const_cast(static_cast(n))->GetPrevInRing(); };
+static node_ptr get_previous(const_node_ptr n) { return
const_cast(n)->pPrev; };
static void set_previous(node_ptr n, node_ptr previous) {
n->pPrev = previous; };
};
#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4) &&
(__GNUC_MINOR__ < 7)
@@ -116,14 +116,14 @@ namespace sw
#endif
friend class boost::iterator_core_access;
typedef
boost::intrusive::circular_list_algorithms algo;
-value_type* pNext;
-value_type* pPrev;
+Ring* pNext;
+Ring* pPrev;
};
template
inline Ring::Ring( value_type* pObj )
-: pNext(static_cast< value_type* >(this))
-, pPrev(static_cast< value_type* >(this))
+: pNext(this)
+, pPrev(this)
{
if( pObj )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Aspiring applicant for gsoc 2015
Hi, This page has a section 'Getting Started with Development', where a few suggestions are made on how and where to get started. https://wiki.documentfoundation.org/Development - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Aspiring applicant for gsoc 2015
Hello, start from the wiki, choose an easyhack and have fun. im on mobile so i cannot give you wiki page. But you can easily find it your own. :) On 4 Feb 2015 14:25, "Nalin Goel" wrote: > Hi, > > I am Nalin Goel , pursuing Undergraduate Program (Computer Science) from > Delhi Technological University(formerly DCE). > > I would love to participate in GSOC 15 and would like to work with Libre > Office. > Can anyone guide me where to get started. > > I am fairly acquainted with C++ and have done many projects in the same. > > Thank You. > > ___ > 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
Aspiring applicant for gsoc 2015
Hi, I am Nalin Goel , pursuing Undergraduate Program (Computer Science) from Delhi Technological University(formerly DCE). I would love to participate in GSOC 15 and would like to work with Libre Office. Can anyone guide me where to get started. I am fairly acquainted with C++ and have done many projects in the same. Thank You. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-projects] minutes of ESC call ...
Hello Michel, Good to have some brand new ideas... any taker to mentor them (or some of them)? -- Cedric On Sun, 2015-02-01 at 13:05 +0100, Michel Renon wrote: > Hi, > > Le 29/01/2015 17:06, Michael Meeks a écrit : > > [...] > > * GSoC (Cedric) > > + We need to have new ideas added to the wiki page: > > https://wiki.documentfoundation.org/Development/Gsoc/Ideas > > + sooner the better etc. preferably before FOSDEM: today / > > tomorrow. > > > here are some ideas : if you think some might be interesting, tell me > and I'll make some specs/ux design > > > > > - writer : > when you drag'n'drop several images in a document, all images are > anchored at the same paragraph. If user wants each image to be bellow > the previous, he has to do that manually (think about writing a user > manual with lots of screenshots). > --> Add something to allow user to select the anchor type (or better : > some predefined layout) of the dropped images. > "something" might be a floating/popup panel or a sidebar panel ? > > > - calc : > indicate sheet protection via something visual in the tab sheets. > Maybe an icon beside the name inside each tab ? > Maybe add an option to visually identify protected cells (dim protected > cells or highlight editable cells) > TBD : how/where to indicate if the whole document is protected ? > > > - calc : >- allow to easily call python/js/beanshell/.. functions from cell > formula. just do "=MyPythonFunction()". It would allow to easily use > scientific python libraries. > >- show a suggestion panel for functions, just bellow the edited cell > (a kind of autocomplete, with infos about function, args...) > >- the suggestion panel may allow to create new functions (name and > arguments) and then switch to macro editor ; default code would include > useful comments (some how-to, building blocks, sample codes...) > >- the existing function wizard should list functions from all > languages (python/js/beanshell/..). TBD : how to handle documentation of > user-defined macros ? > > > - macros : >- reorganize dialogs (I made a quick proposal that would need further > polishing) : > https://wiki.documentfoundation.org/Design/Whiteboard/Macros_Dialogs#Proposal_by_Michel_R > (but the iTunes-like selector is not consistent with the current macro > editor) > >- replace the macro editor engine with scintilla > (http://www.scintilla.org/) to allow to edit easily other languages > (python/js/beanshell/..) ; writing a scintilla lexer for LOBasic should > not be complicated. > > > > > - general: > reorganize "Insert" menu > ex with writer : > https://wiki.documentfoundation.org/User:Michelr#Writer_:_new_Insert_menu > (A consequence is that OLE embedding needs to have some visual/UX bugs > corrected : I'll file bugs asap) > > > > - writer/calc : > transpose the current "table design" sidebar panel from impress to > writer and calc. > It would not answer the need for table styles, but it would replace > existing obsolete autoformat dialog. > For calc, it would modify selected cells. > The "table design" panel could be slightly enhanced to handle some more > options (change colors, text options...) > > > > - draw: > when user selects multiple shapes, there is only one visual selection (a > rect with 9 green handles) around all selected objets. The problem is > that user doesn't know exactly which objects are selected. > Change that to have each object selected, with their own blue handles. > > > > > Hope this helps, > > Michel > > > > > ___ > 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] core.git: Branch 'feature/tiled-editing' - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java |
12 +-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit a1368867ae60f6d79469ad439ec5e200740ab4ef
Author: Tomaž Vajngerl
Date: Wed Feb 4 21:13:45 2015 +0900
android: blinking cursor
Change-Id: I1e2d5df7917ec0f8e780e3e3481dadd10b1b76ed
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
index d9e51fc..1aed2f0 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
@@ -29,9 +29,11 @@ public class TextCursorView extends ImageView {
private int mWidth;
private int mHeight;
+private int mAlpha = 0;
public TextCursorView(Context context, AttributeSet attrs) {
super(context, attrs);
+postDelayed(cursorAnimation, 500);
}
public void changePosition(RectF position) {
@@ -57,7 +59,6 @@ public class TextCursorView extends ImageView {
mTop = Math.round(scaled.centerY() - y);
setScaleY(scaled.height());
-
setLayoutPosition();
}
@@ -76,4 +77,13 @@ public class TextCursorView extends ImageView {
setLayoutParams(mLayoutParams);
}
+
+private Runnable cursorAnimation = new Runnable() {
+public void run() {
+mAlpha = mAlpha == 0 ? 0xFF : 0;
+getDrawable().setAlpha(mAlpha);
+invalidate();
+postDelayed(cursorAnimation, 500);
+}
+};
}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/drpcps.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 727c3e088698dfd21cf4beaa5455d4c4d5b495fb Author: Caolán McNamara Date: Wed Feb 4 11:31:14 2015 + tdf#88854 crash on opening drop caps Change-Id: I3ab56e4909d2a20dc8f0bafe0273e81065296f17 diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index fd9c893..09801c2 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -394,7 +394,9 @@ void SwDropCapsPict::DrawPrev( const Point& rPt ) rFnt.DrawPrev( this, mpPrinter, aPt, maText, nStart, nEnd - nStart ); -aPt.X() += maScriptChanges[ nIdx ].textWidth; +if (!maScriptChanges.empty()) +aPt.X() += maScriptChanges[ nIdx ].textWidth; + if ( !GetNextScriptSegment(nIdx, nStart, nEnd, nScript) ) break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 24 commits - filter/source lotuswordpro/source sc/source sd/inc sd/source sw/source vcl/generic vcl/inc vcl/source vcl/workben
filter/source/config/cache/filtercache.cxx | 69 +
filter/source/config/cache/filtercache.hxx |7 --
filter/source/msfilter/msdffimp.cxx|6 +
filter/source/msfilter/svdfppt.cxx | 10 +--
lotuswordpro/source/filter/lwpparastyle.cxx|2
lotuswordpro/source/filter/xfilter/xfstylecont.cxx | 18 +
lotuswordpro/source/filter/xfilter/xftable.cxx |4 -
sc/source/core/tool/interpr1.cxx | 11 ++-
sc/source/filter/starcalc/scflt.cxx|2
sd/inc/sdmod.hxx |9 ++
sd/source/ui/unoidl/unoobj.cxx | 22 ++
sd/source/ui/view/drviews6.cxx |3
sw/source/core/crsr/crsrsh.cxx |4 +
sw/source/core/text/txtfrm.cxx |6 -
sw/source/uibase/shells/basesh.cxx | 22 +++---
sw/source/uibase/uiview/view2.cxx |3
vcl/generic/glyphs/gcach_layout.cxx|2
vcl/inc/sallayout.hxx |7 --
vcl/source/filter/wmf/winwmf.cxx |5 +
vcl/workben/vcldemo.cxx|2
20 files changed, 107 insertions(+), 107 deletions(-)
New commits:
commit e537d227d3a801076aff98c113650942fb6b3699
Author: Caolán McNamara
Date: Wed Feb 4 09:28:37 2015 +
hard to find accidental leaks with all the deliberate ones
so make these globals belong to the SfxModule which gets
torn down before exit
Change-Id: Iad655f8726ba6784a5d606ef469522950906360a
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index d339c09..d2a64ac 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -26,11 +26,13 @@
#include
#include
#include "sddllapi.h"
+#include
#include
#include
#include
#include
#include
+#include
#include
class SdOptions;
@@ -58,6 +60,9 @@ enum SdOptionStreamMode
SD_OPTION_STORE = 1
};
+typedef boost::ptr_map< sal_uIntPtr, SfxExtItemPropertySetInfo >
SdExtPropertySetInfoCache;
+typedef boost::ptr_map< sal_uInt32, css::uno::Sequence< css::uno::Type> >
SdTypesCache;
+
/*
This subclass of (which is a subclass of ) is
@@ -122,6 +127,10 @@ public:
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
) SAL_OVERRIDE;
virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent,
const SfxItemSet& rSet ) SAL_OVERRIDE;
+SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
+SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache;
+SdTypesCache gImplTypesCache;
+
protected:
SdOptions* pImpressOptions;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 329dd98..47fe407 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -85,13 +85,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::drawing::XShape;
-typedef std::map
SdExtPropertySetInfoCache;
-static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
-static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache;
-
-typedef std::map*> SdTypesCache;
-static SdTypesCache gImplTypesCache;
-
#define WID_EFFECT 1
#define WID_SPEED 2
#define WID_TEXTEFFECT 3
@@ -344,8 +337,9 @@ uno::Sequence< uno::Type > SAL_CALL SdXShape::getTypes()
}
else
{
-const sal_uInt32 nObjId = mpShape->getShapeKind();
+sal_uInt32 nObjId = mpShape->getShapeKind();
uno::Sequence< uno::Type >* pTypes;
+SdTypesCache& gImplTypesCache = SD_MOD()->gImplTypesCache;
SdTypesCache::iterator aIter( gImplTypesCache.find( nObjId ) );
if( aIter == gImplTypesCache.end() )
{
@@ -354,7 +348,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXShape::getTypes()
pTypes->realloc( nCount+1 );
(*pTypes)[nCount] = cppu::UnoType::get();
-gImplTypesCache[ nObjId ] = pTypes;
+gImplTypesCache.insert(nObjId, pTypes);
}
else
{
@@ -430,17 +424,17 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const
OUString& aPropertyName )
sal_uIntPtr nObjId =
reinterpret_cast(mpShape->getPropertyMapEntries());
SfxExtItemPropertySetInfo* pInfo = NULL;
-SdExtPropertySetInfoCache* pCache = (mpModel &&
mpModel->IsImpressDocument()) ?
-&gImplImpressPropertySetInfoCache : &gImplDrawPropertySetInfoCache;
+SdExtPropertySetInfoCache& rCache = (mpModel &&
mpModel->IsImpressDocument()) ?
+SD_MOD()->gImplImpressPropertySetInfoCache :
SD_MOD()->gImplDrawPropertySetInfoCache;
-SdExtPropertySetInfoCache::iterator aIter( pCache->find( nObjId ) );
-if( aIter == pCache->end() )
+SdExtPropertySetInfoCache::iterator aIter( rCache.find( nObjId ) );
+if( aIter == rCache.end() )
{
uno::Reference<
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/mmconfigitem.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit fc1953362d93721668b4f835eafef4e6c1fe4eea
Author: Michael Stahl
Date: Tue Feb 3 15:48:43 2015 +0100
sw: convert legacy assertions in mmconfigitem.cxx
Change-Id: Ief76c578aaddbeada7f436373879a6dbbd11908f
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx
b/sw/source/uibase/dbui/mmconfigitem.cxx
index 341fcd8..f4efd1a 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -211,7 +211,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
const Sequence& rNames = GetPropertyNames();
Sequence aValues = GetProperties(rNames);
const Any* pValues = aValues.getConstArray();
-OSL_ENSURE(aValues.getLength() == rNames.getLength(), "GetProperties
failed");
+assert(aValues.getLength() == rNames.getLength());
if(aValues.getLength() == rNames.getLength())
{
for(int nProp = 0; nProp < rNames.getLength(); nProp++)
@@ -421,7 +421,7 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const
ResStringArray& rHead
}
else
{
-OSL_FAIL("parse error in address block or greeting line");
+SAL_WARN("sw.ui", "parse error in address block or greeting
line");
}
}
else
@@ -906,18 +906,18 @@ Reference< XResultSet>
SwMailMergeConfigItem::GetResultSet() const
xRowProperties->setPropertyValue("ApplyFilter",
makeAny(!m_pImpl->sFilter.isEmpty()));
xRowProperties->setPropertyValue("Filter",
makeAny(m_pImpl->sFilter));
}
-catch (const Exception&)
+catch (const Exception& e)
{
-OSL_FAIL("exception caught in xResultSet->SetFilter()");
+SAL_WARN("sw.ui", "exception caught: " << e.Message);
}
xRowSet->execute();
m_pImpl->xResultSet = xRowSet.get();
m_pImpl->xResultSet->first();
m_pImpl->nResultSetCursorPos = 1;
}
-catch (const Exception&)
+catch (const Exception& e)
{
-OSL_FAIL("exception caught in:
SwMailMergeConfigItem::GetResultSet() ");
+SAL_WARN("sw.ui", "exception caught in:
SwMailMergeConfigItem::GetResultSet() " << e.Message);
}
}
return m_pImpl->xResultSet;
@@ -953,9 +953,9 @@ void SwMailMergeConfigItem::SetFilter(OUString& rFilter)
uno::Reference xRowSet( m_pImpl->xResultSet,
UNO_QUERY_THROW );
xRowSet->execute();
}
-catch (const Exception&)
+catch (const Exception& e)
{
-OSL_FAIL("exception caught in
SwMailMergeConfigItem::SetFilter()");
+SAL_WARN("sw.ui", "exception caught in
SwMailMergeConfigItem::SetFilter(): " << e.Message);
}
}
}
@@ -1612,7 +1612,7 @@ void
SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo& rInfo)
SwDocMergeInfo& SwMailMergeConfigItem::GetDocumentMergeInfo(sal_uInt32
nDocument)
{
-OSL_ENSURE(m_pImpl->aMergeInfos.size() > nDocument,"invalid document
index");
+assert(nDocument < m_pImpl->aMergeInfos.size());
return m_pImpl->aMergeInfos[nDocument];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-projects] minutes of ESC call ...
On 2015-02-01 02:05 PM, Michel Renon wrote: here are some ideas : if you think some might be interesting, tell me and I'll make some specs/ux design Those are some very good ideas! Even if they don't make the GSOC, they should probably be logged in bugzilla. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: Loosing formula (hence data) in MSO, raise priority and backport to 4.3, 4.4.
Hi Kálmán, > This week I hit this problem: > https://bugs.documentfoundation.org/show_bug.cgi?id=89042 > and I saw this was fixed here: > https://bugs.documentfoundation.org/show_bug.cgi?id=81596 > Since this bug causes data lost (converting formula to its value) while load > files to MSO2010-13 I would like to ask you to raise its priority and > backport this bug to all maintained version of LibreOffice Yesterday you put your request into bug report 81596. I have not had time to respond as I don't know yet if the patch can easily be applied to version 4.4 and 4.3. Using the bug reports is the best way to put your request. This mailing list is intended for developers and posts about code and code changes. HTH, Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Loosing formula (hence data) in MSO, raise priority and backport to 4.3, 4.4.
Hi Folks, This week I hit this problem: https://bugs.documentfoundation.org/show_bug.cgi?id=89042 and I saw this was fixed here: https://bugs.documentfoundation.org/show_bug.cgi?id=81596 Since this bug causes data lost (converting formula to its value) while load files to MSO2010-13 I would like to ask you to raise its priority and backport this bug to all maintained version of LibreOffice Thank you in advance! Best Regards: Kálmán (KAMI) Szalai ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
