[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sw/source
sfx2/inc/sfx2/templateviewitem.hxx |3 ++-
sfx2/inc/sfx2/thumbnailviewitem.hxx |3 ++-
sfx2/source/control/templatelocalview.cxx|2 +-
sfx2/source/control/templateviewitem.cxx |8 ++--
sfx2/source/control/thumbnailview.cxx|2 +-
sfx2/source/control/thumbnailviewitem.cxx|6 +-
sw/source/filter/ww8/docxattributeoutput.cxx | 17 -
sw/source/filter/ww8/docxattributeoutput.hxx |1 +
8 files changed, 30 insertions(+), 12 deletions(-)
New commits:
commit c1c2688912e769dfd7654e11e87dae380a8ce1eb
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Aug 21 07:02:46 2012 +0200
fdo#53175: Fixed the end of hyperlinks
This fixes the end of hyperlinks appearing after field ends (while the
start of hyperlink is after field start too).
Change-Id: If21b8973baaca183e0103e3a70ed98b99aa59392
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cbca1b6..71c1915 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -559,6 +559,7 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
m_pHyperlinkAttrList = NULL;
+m_startedHyperlink = true;
}
DoWriteBookmarks( );
@@ -575,16 +576,21 @@ void DocxAttributeOutput::EndRun()
WritePostponedMath();
+if ( m_closeHyperlinkInThisRun )
+{
+if ( m_startedHyperlink )
+{
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_startedHyperlink = false;
+}
+m_closeHyperlinkInThisRun = false;
+}
+
while ( m_Fields.begin() != m_Fields.end() )
{
EndField_Impl( m_Fields.front( ) );
m_Fields.erase( m_Fields.begin( ) );
}
-if ( m_closeHyperlinkInThisRun )
-{
-m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_closeHyperlinkInThisRun = false;
-}
// if there is some redlining in the document, output it
EndRedline();
@@ -4401,6 +4407,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_pParentFrame( NULL ),
m_closeHyperlinkInThisRun( false ),
m_closeHyperlinkInPreviousRun( false ),
+ m_startedHyperlink( false ),
m_postponedGraphic( NULL ),
m_postponedMath( NULL ),
m_postitFieldsMaxId( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 24b6836..3a9c7cb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -592,6 +592,7 @@ private:
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
+bool m_startedHyperlink;
struct PostponedGraphic
{
commit a873be622198c8a9ac59452e64d919d363e32d72
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Aug 21 06:24:19 2012 +0200
template manager: setFontAttribute on TextLayouterDevice is needed
or you could have some weird values initialised much earlier (remember,
that TextLayouterDevice shares its device)
Change-Id: Ia8e44e578dc1bff6bdc97a3007db51e20692593d
diff --git a/sfx2/inc/sfx2/templateviewitem.hxx
b/sfx2/inc/sfx2/templateviewitem.hxx
index a64b15d..992af40 100644
--- a/sfx2/inc/sfx2/templateviewitem.hxx
+++ b/sfx2/inc/sfx2/templateviewitem.hxx
@@ -41,7 +41,8 @@ public:
const rtl::OUString getSubTitle () const { return maSubTitle; }
virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
- const long nPadding, sal_uInt32
nMaxTextLenght);
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs);
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx
b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index aab7fe3..91a6884 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -104,7 +104,8 @@ public:
const Rectangle getDrawArea () const { return maDrawArea; }
virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
- const long nPadding, sal_uInt32
nMaxTextLenght);
+ const long nPadding, sal_uInt32
nMaxTextLenght,
+ const ThumbnailItemAttributes
*pAttrs);
const Point getTextPos () const { return maTextPos; }
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 53175, which changed state. Bug 53175 Summary: FILEOPEN error reading “Content (TOC)” from a DOCX https://bugs.freedesktop.org/show_bug.cgi?id=53175 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'feature/gbuild_external'
New branch 'feature/gbuild_external' available with the following commits: commit 6be6c127de4ff14663ae02ce1c6890b48d4356f5 Author: David Tardon dtar...@redhat.com Date: Mon Aug 20 14:06:44 2012 +0200 adapt clucene for UnpackedTarball Change-Id: I52d78c396511ee44c18ba9473b9602fc4e6f947f commit 2ae59faf481deef75ecd6ce1907520bd3083ba1e Author: David Tardon dtar...@redhat.com Date: Mon Aug 20 11:16:21 2012 +0200 adapt ucpp for UnpackedTarball Change-Id: I0871baf8a6c72ea0c7b44a7abfc8d5152b331db5 commit 5d4eb791b06cb4509bcd0d2cb57de86ccf515885 Author: David Tardon dtar...@redhat.com Date: Mon Aug 20 11:15:05 2012 +0200 add support for external tarballs to gbuild Change-Id: Ic6645e9943b2445ebb37bb99114f777527c69af9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: REMINDER: Release 3.6.0-rc2 from libreoffice-3-6-1 branch
Hi, Peter! Cedric fixed Bug 53175 [FILEOPEN error reading Content (TOC) from a DOCX] today. I think that this commit should be made to LibO-3.6.1rc2 (final), because the fix Bug 52610 [FILESAVE particular document as. Docx (Office Open): Can not be opened with other office software] was included in the LibO-3.6.1rc1. Best regards! -- ape -- View this message in context: http://nabble.documentfoundation.org/REMINDER-Release-3-6-0-rc2-from-libreoffice-3-6-1-branch-tp4002431p4002621.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 4cc09d0e0d8e0eaed36ffc9ae3baaa3fcfac30cb Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 21 08:50:03 2012 +0200 stdint.h is not C++98 ...and appears to be unused here, anyway. Change-Id: I8dc82b8b6a37b9762baf30a7bfa6e5ae2723eb0e diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 0ff8e43..32efc05 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -13,7 +13,6 @@ #include gio/gio.h #include sys/unistd.h #endif -#include stdint.h #include sys/socket.h #include tools/debug.hxx #include tools/stream.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gbuild support for external projects
Hi all, I have created a new gbuild class UnpackedTarball that handles preparing sources for external project: unpacking, patching and a bit more (required by clucene). It is based on the custom target from module clucene, which is itself based on Norbert's ExternalLib gbuild class, I think (I have not reused ExternalLib, because I only wanted to handle the preparation part). I also updated clucene and ucpp (the only two external modules converted to gbuild so far) to use it. With this in place, I hope we can relatively easily convert the dozen or so external modules that are built by dmake (BUILD_ACTION=dmake) now. As for the rest of the external modules, my current idea is to use free-form makefile, like CustomTarget, for everything but preparation of sources. That would match the current dmake makefiles pretty well, I think... The code lives on branch feature/gbuild_external. I am pretty confident it will not break on Windows, but I will not mind testers :-) If there are no violent objectives, I will merge it to master in 1-2 days. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 53252, which changed state. Bug 53252 Summary: UI: CRASH when edit LibO File Dialog Path Pane https://bugs.freedesktop.org/show_bug.cgi?id=53252 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 17 -
sw/source/filter/ww8/docxattributeoutput.hxx |1 +
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit f672ba611a8cef83acad3233d27dc6414b463a42
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Aug 21 07:02:46 2012 +0200
fdo#53175: Fixed the end of hyperlinks
This fixes the end of hyperlinks appearing after field ends (while the
start of hyperlink is after field start too).
Change-Id: If21b8973baaca183e0103e3a70ed98b99aa59392
(cherry picked from commit c1c2688912e769dfd7654e11e87dae380a8ce1eb)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 71d39af..34e383c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -573,6 +573,7 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
m_pHyperlinkAttrList = NULL;
+m_startedHyperlink = true;
}
DoWriteBookmarks( );
@@ -588,16 +589,21 @@ void DocxAttributeOutput::EndRun()
WritePostponedMath();
+if ( m_closeHyperlinkInThisRun )
+{
+if ( m_startedHyperlink )
+{
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_startedHyperlink = false;
+}
+m_closeHyperlinkInThisRun = false;
+}
+
while ( m_Fields.begin() != m_Fields.end() )
{
EndField_Impl( m_Fields.front( ) );
m_Fields.erase( m_Fields.begin( ) );
}
-if ( m_closeHyperlinkInThisRun )
-{
-m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_closeHyperlinkInThisRun = false;
-}
// if there is some redlining in the document, output it
EndRedline();
@@ -4375,6 +4381,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_pParentFrame( NULL ),
m_closeHyperlinkInThisRun( false ),
m_closeHyperlinkInPreviousRun( false ),
+ m_startedHyperlink( false ),
m_postponedGraphic( NULL ),
m_postponedMath( NULL ),
m_postitFieldsMaxId( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 788905f..db78516 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -590,6 +590,7 @@ private:
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
+bool m_startedHyperlink;
struct PostponedGraphic
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/sdremote
android/sdremote/.project
|2
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
|6 +
android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
|5 +
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
| 47 +++---
4 files changed, 49 insertions(+), 11 deletions(-)
New commits:
commit 78d15f219ea5570b1b08c1122ac0d9c0e1736b46
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 21 09:30:45 2012 +0200
Emulator detection. Fix crash on bluetoothless devices.
Change-Id: Ia4845940a83361cad1e824832dcad05019192705
diff --git a/android/sdremote/.project b/android/sdremote/.project
index 70ef552..1a4d0d2 100644
--- a/android/sdremote/.project
+++ b/android/sdremote/.project
@@ -1,6 +1,6 @@
?xml version=1.0 encoding=UTF-8?
projectDescription
- nameImpressRemote/name
+ nameSDRemote/name
comment/comment
projects
/projects
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
index d93ea5c..a686618 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothFinder.java
@@ -28,6 +28,9 @@ public class BluetoothFinder {
}
public void startFinding() {
+if (mAdapter == null) {
+return; // No bluetooth adapter found (emulator, special devices)
+}
System.out.println(BT:Discovery starting);
IntentFilter aFilter = new IntentFilter(
BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
@@ -39,6 +42,9 @@ public class BluetoothFinder {
}
public void stopFinding() {
+if (mAdapter == null) {
+return; // No bluetooth adapter found (emulator, special devices)
+}
mAdapter.cancelDiscovery();
try {
mContext.unregisterReceiver(mReceiver);
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
index dfa75fe..08f973f 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
@@ -10,6 +10,11 @@ public class Server {
private String mAddress;
private String mName;
private long mTimeDiscovered;
+/**
+ * Signifies a Server that shouldn't be automatically removed from the
list.
+ * Used e.g. for the emulator.
+ */
+protected boolean mNoTimeout = false;
protected Server(Protocol aProtocol, String aAddress, String aName,
long aTimeDiscovered) {
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
index 4734ff4..79839e7 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
@@ -9,6 +9,8 @@ import java.net.SocketException;
import java.util.Collection;
import java.util.HashMap;
+import org.libreoffice.impressremote.communication.Server.Protocol;
+
import android.content.Context;
import android.content.Intent;
@@ -69,15 +71,11 @@ public class ServerFinder {
mServerList.put(aServer.getAddress(), aServer);
System.out.println(Contains: + aName + );
-Intent aIntent = new Intent(
-CommunicationService.MSG_SERVERLIST_CHANGED);
-mContext.sendBroadcast(aIntent);
+notifyActivity();
} catch (java.net.SocketTimeoutException e) {
// Ignore -- we want to timeout to enable checking whether we
// should stop listening periodically
} catch (IOException e) {
-// TODO Auto-generated catch block
-e.printStackTrace();
}
}
@@ -92,6 +90,7 @@ public class ServerFinder {
mListenerThread = new Thread() {
@Override
public void run() {
+checkAndAddEmulator();
long aTime = 0;
try {
mSocket = new DatagramSocket();
@@ -106,13 +105,13 @@ public class ServerFinder {
PORT);
mSocket.send(aPacket);
aTime = System.currentTimeMillis();
+// Remove stale servers
for (Server aServer : mServerList.values()) {
-
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5441d69b05328159cb70b25931663612854a473 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 21 09:43:16 2012 +0200 More LINUX-ism Change-Id: I7a396445a5244ff9683ca10c13c139646e313911 diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 32efc05..0052397 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -12,8 +12,8 @@ #ifdef LINUX #include gio/gio.h #include sys/unistd.h -#endif #include sys/socket.h +#endif #include tools/debug.hxx #include tools/stream.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Winfried Donkers o...@dci-electronics.nl changed: What|Removed |Added Depends on||53673 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #83 from Winfried Donkers o...@dci-electronics.nl 2012-08-21 08:00:01 UTC --- added 53325 regression problem: layout of created label/mail-merge documents broken. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #84 from Winfried Donkers o...@dci-electronics.nl 2012-08-21 08:01:12 UTC --- (In reply to comment #83) added 53325 regression problem: layout of created label/mail-merge documents broken. for 53325 read 53673... -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gerrit: Why 'verified'?
Hi Bjoern, On 2012-08-20 at 16:45 +0200, Bjoern Michaelsen wrote: Also ideally in the end you will set the change to +2 codereview and a tinderbox later moves along and builds/tests the change. Once the tinderbox reports it is happy too, the change gets merged. So it is more for some future work, at the moment it is more a usability problem, as I see it, thanks for the explanation! This is not the first gerrit interface UX problem I am unhappy about, and would like to fix that (have a single radiobutton in the review page, with the appropriate possibilities). Not that I am that happy to hack gerrit, but I'd like to get my another favorite one (the [Show All Unified]) resolved too, so - what is the latest view on patching our gerrit instance? Judging from our opengrok instance (that we had to patch too), I am afraid using just the vanilla one will not work in the long run. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/abs-lib android/sdremote
android/abs-lib/project.properties |
2 -
android/sdremote/AndroidManifest.xml |
4 +-
android/sdremote/res/values/styles.xml |
10 +++--
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
19 --
4 files changed, 27 insertions(+), 8 deletions(-)
New commits:
commit 7af4168b4f1212de0270d043f7de7143ea671aff
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 21 10:25:01 2012 +0200
Fixes to run on Android 2.3
Change-Id: I5934264083a1cd7b33fdcd9869957c222825df60
diff --git a/android/abs-lib/project.properties
b/android/abs-lib/project.properties
index f28bc83..5ca7d62 100755
--- a/android/abs-lib/project.properties
+++ b/android/abs-lib/project.properties
@@ -9,4 +9,4 @@
android.library=true
# Project target.
-target=android-15
+target=android-14
diff --git a/android/sdremote/AndroidManifest.xml
b/android/sdremote/AndroidManifest.xml
index 04255fd..b21ce6a 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -9,8 +9,8 @@
uses-permission android:name=android.permission.BLUETOOTH_ADMIN /
uses-sdk
-android:minSdkVersion=14
-android:targetSdkVersion=14 /
+android:minSdkVersion=10
+android:targetSdkVersion=10 /
application
android:label=@string/app_name
diff --git a/android/sdremote/res/values/styles.xml
b/android/sdremote/res/values/styles.xml
index e5a4651..de47193 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -19,9 +19,11 @@
item name=android:textSize18dp/item
/style
-style name=Theme.ImpressRemote.ActionBar
parent=android:style/Widget.Holo.Light.ActionBar
+style name=Theme.ImpressRemote.ActionBar
parent=Widget.Sherlock.Light.ActionBar.Solid.Inverse
item name=android:background@color/orange/item
+item name=background@color/orange/item
item
name=android:titleTextStyle@style/Theme.ImpressRemote.ActionBar.Title/item
+item
name=titleTextStyle@style/Theme.ImpressRemote.ActionBar.Title/item
/style
style name=Theme.ImpressRemote.ActionBarWidget
parent=android:style/Widget.Holo.Light
@@ -35,14 +37,16 @@
!-- item name=android:popupBackground@color/black/item --
/style
-style name=Theme.ImpressRemote.ActionBarMenuItem
parent=android:style/Widget.Holo.Light.ListView.DropDown
+style name=Theme.ImpressRemote.ActionBarMenuItem
parent=Widget.Sherlock.Light.Spinner.DropDown.ActionBar
item name=android:background@color/grey/item
+
item name=android:textColor@color/white/item
item name=android:textSize16dp/item
/style
-style name=Theme.ImpressRemote parent=android:style/Theme.Holo.Light
+style name=Theme.ImpressRemote
parent=Theme.Sherlock.Light.DarkActionBar
item
name=android:actionBarStyle@style/Theme.ImpressRemote.ActionBar/item
+item name=actionBarStyle@style/Theme.ImpressRemote.ActionBar/item
item
name=android:popupMenuStyle@style/Theme.ImpressRemote.ActionBarMenu/item
item
name=android:dropDownListViewStyle@style/Theme.ImpressRemote.ActionBarMenuItem/item
item
name=android:textAppearanceLargePopupMenu@style/Theme.ImpressRemote.ActionBarMenuItem/item
!-- item
name=android:actionBarWidgetTheme@style/Theme.ImpressRemote.ActionBarWidget/item
--
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 2ce7db1..ac15028 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -28,6 +28,7 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
+import android.widget.FrameLayout.LayoutParams;
import android.widget.TextView;
import android.widget.ToggleButton;
@@ -293,8 +294,22 @@ public class PresentationActivity extends
SherlockFragmentActivity {
}
mClockBar_clockButton.setChecked(!mTimerOn);
-mCountdownBar.setY(mClockBar.getHeight());
-mStopwatchBar.setY(mClockBar.getHeight());
+FrameLayout.LayoutParams aParams = (LayoutParams) mCountdownBar
+.getLayoutParams();
+aParams.topMargin = mClockBar.getBottom();
+//aParams.height = mClockBar.getHeight();
+//aParams.bottomMargin = aParams.topMargin +
aParams.height;
+//aParams.leftMargin = 100;
+mCountdownBar.setLayoutParams(aParams);
+mCountdownBar.setPadding(0, mClockBar.getBottom(), 0, 0);
+
Re: [PUSHED 3-6][REVIEW 3-6-1] fdo#53280: Reset read-only UI after successful Save As
On 08/16/2012 06:56 PM, Michael Meeks wrote:
Sure - everyone's spent time doing that; like looking for:
if (a);
{
always_happens();
}
...which contemporary compilers warn about, anyway. -- But sure, they
could warn about the other case, too:
if (a)
sometimes_happens();
// some deceptively indented comment
always_happens();
Well - it seems that as each person touches the code, and has a
different view they change the local scope. c'est la vie. I usually try
to go for consistency in the function / module.
On that basis it's notable that you made that function inconsistent on
this topic :-)
Yes, using braces is one notable case where I deliberately deviate from
existing practice in a given file. (Though not in the question of
whether to place the opening brace on a line by itself, which can lead
to that excessive-looking vertical whitespace.)
Anyway, even if we agree to disagree here, the devilishly deceiving
cases I remember all involved if-sans-braces which originally covered a
single statement plus comment (as above), so maybe we can agree that at
least in such cases it doesn't harm to add redundant braces.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc
sal/inc/systools/win32/comptr.hxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 95b26a37eec7800a337f4522c9235f6e6306de32
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Aug 21 10:24:58 2012 +0200
mingw doesn't know __uuidof
Copied from fpicker/source/win32/filepicker/comptr.hxx, which
otherwise seems to be the same file.
Change-Id: I51ca96c1280e75f9318fcbc74997b2bf755fff95
diff --git a/sal/inc/systools/win32/comptr.hxx
b/sal/inc/systools/win32/comptr.hxx
index fe7b651..7ef5123 100644
--- a/sal/inc/systools/win32/comptr.hxx
+++ b/sal/inc/systools/win32/comptr.hxx
@@ -174,12 +174,14 @@ class ComPtr
}
}
+#ifndef __MINGW32__
//-
template class T_QUERYINTERFACE
HRESULT query(T_QUERYINTERFACE** pQuery)
{
return m_pInterface-QueryInterface(__uuidof(T_QUERYINTERFACE),
(void**)pQuery);
}
+#endif
//-
HRESULT query(REFIID rIID ,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED][PATCH] fix dead code and fields in Java code
On 08/20/2012 05:37 PM, Caolán McNamara wrote:
On Fri, 2012-08-17 at 17:15 +0200, Noel Grandin wrote:
These patches remove various bits of dead code in the Java files.
With one trivial change built and passed make check for me, pushed now
With Java's reflection mechanisms, it is hard to tell whether a field is
really unused---even if it is private---, but
--- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
+++ b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
@@ -29,9 +29,6 @@ import com.sun.star.comp.juhtest.SmoketestCommandEnvironment;
*/
public class JavaUNOHelperServices {
-static private final String __service_smoketestCommandEnv =
-com.sun.star.deployment.test.SmoketestCommandEnvironment;
-
/**
* Gives a factory for creating the service.
* This method is called by the codeJavaLoader/code
appears to have been of no use indeed (at least, smoketest still works).
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: widget layout progress
Hi Caolán, On 2012-08-20 at 17:03 +0100, Caolán McNamara wrote: Full Conversion: Here's what a full conversion of a dialog away from the binary res format to the xml .ui format would look like http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/cmclayouttransid=064c21aec9245148e90290afd00c46b0999d19c4 i.e. a) remove the .src and .hrc b) remove from the .hxx and .cxx any controls which only exist in the code in order to get them loaded from the .res file c) adapt the code to use get_by_name to find a widget if code needs to get an explicit handle to one to set callbacks or whatever[*] [...] [*] maybe the cast-happy syntax looks a bit vile. Perhaps a bit family of get_foos_by_name, or a get_by_nameT template instead ? This is great, I hope I'm not going to start some bikeshedding fest :-) The thing that hit my eyes is the use of string identifiers to address the UI elements. Could we (for the compilation purposes) generate .hxx files out of the .ui files that would allow to do something like: m_pBodyContent = modules::swriter::ui::linenumbering::content::get(m_pUIBuilder); [or whatever syntax equivalent that would avoid the use of string literal] Of course, that has nothing to do with the runtime, internally it would be still indexed by name etc., so if somebody edits his/her .ui file not carefully after the build, they'd be in trouble, but at least, during the build we'd be fine. Another extremely minor question - why the modules/ prefix? Is that needed? - seems to just repeat on many places (mainly in help), so maybe we could avoid that? Thanks a lot, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ATTENTION] Gerrit is now the primary git repo. Freedesktop is now read-only
Norbert Thiebaud píše v So 18. 08. 2012 v 12:59 -0500: On Sat, Aug 18, 2012 at 12:15 PM, David Tardon dtar...@redhat.com wrote: Hi, It seems that some branches that had been deleted on fd.o have crept back. And they cannot be deleted again: $ git push origin :feature/gbuild_sdext remote: Processing changes: refs: 1, done To ssh://dtardon@logerrit/core ! [remote rejected] feature/gbuild_sdext (can not delete references) error: failed to push some refs to 'ssh://dtardon@logerrit/core' This seems to be an ACL issue as I was able to execute successfully that very command. Maybe we should give rights to create/delete branches and tags to more developers. Feature branches will be quite common task. Also I would imagine that distro maintainers might want to create some distro-specific tags for their releases. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/res/layout/presentation_clockbar.xml| 116 +++--- android/sdremote/res/layout/presentation_clockbar_countdownbar.xml | 29 -- android/sdremote/res/layout/presentation_clockbar_stopwatchbar.xml | 28 -- android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 41 +-- 4 files changed, 106 insertions(+), 108 deletions(-) New commits: commit 09f1ff4f59a89b10d5475b7296351c1dd0f09633 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Tue Aug 21 10:52:16 2012 +0200 Restyle and refactor clockbar to work with 2.3. Change-Id: I2101fd1ef41ac71f81875ba845250ce875a242b5 diff --git a/android/sdremote/res/layout/presentation_clockbar.xml b/android/sdremote/res/layout/presentation_clockbar.xml index 1e2e097..4d5d028 100644 --- a/android/sdremote/res/layout/presentation_clockbar.xml +++ b/android/sdremote/res/layout/presentation_clockbar.xml @@ -1,36 +1,96 @@ ?xml version=1.0 encoding=utf-8? LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; -android:id=@+id/clockbar +android:id=@+id/clockbars_container android:layout_width=match_parent android:layout_height=wrap_content -android:background=#EE313131 -android:orientation=horizontal +android:orientation=vertical -ToggleButton -android:id=@+id/clockbar_toggle_clockmode -android:layout_width=0dp +LinearLayout +android:id=@+id/clockbar +android:layout_width=match_parent android:layout_height=wrap_content -android:layout_weight=1 -android:background=@drawable/clockbar_clock -android:textOff= -android:textOn= / - -ToggleButton -android:id=@+id/clockbar_toggle_stopwatchmode -android:layout_width=0dp -android:layout_height=wrap_content -android:layout_weight=1 -android:background=@drawable/clockbar_stopwatch -android:textOff= -android:textOn= / - -ToggleButton -android:id=@+id/clockbar_toggle_countdownmode -android:layout_width=0dp -android:layout_height=wrap_content -android:layout_weight=1 -android:background=@drawable/clockbar_countdown -android:textOff= -android:textOn= / +android:background=#EE313131 +android:orientation=horizontal + +ToggleButton +android:id=@+id/clockbar_toggle_clockmode +android:layout_width=0dp +android:layout_height=wrap_content +android:layout_weight=1 +android:background=@drawable/clockbar_clock +android:textOff= +android:textOn= / + +ToggleButton +android:id=@+id/clockbar_toggle_stopwatchmode +android:layout_width=0dp +android:layout_height=wrap_content +android:layout_weight=1 +android:background=@drawable/clockbar_stopwatch +android:textOff= +android:textOn= / + +ToggleButton +android:id=@+id/clockbar_toggle_countdownmode +android:layout_width=0dp +android:layout_height=wrap_content +android:layout_weight=1 +android:background=@drawable/clockbar_countdown +android:textOff= +android:textOn= / +/LinearLayout + +LinearLayout +android:id=@+id/clockbar_stopwatchbar +android:layout_width=match_parent +android:layout_height=48dp +android:background=#DD4D4D4D +android:orientation=horizontal + +Button +android:id=@+id/clockbar_stopwatch_run +android:layout_width=0dip +android:layout_height=match_parent +android:layout_weight=1 +android:background=# +android:text=@string/clock_timer_start +android:textColor=#FF / + +Button +android:id=@+id/clockbar_stopwatch_reset +android:layout_width=0dip +android:layout_height=match_parent +android:layout_weight=1 +android:background=# +android:text=@string/clock_timer_reset +android:textColor=#FF / +/LinearLayout + +LinearLayout +android:id=@+id/clockbar_countdownbar +android:layout_width=match_parent +android:layout_height=48dp +android:background=#DD4D4D4D +android:orientation=horizontal + +EditText +android:id=@+id/clockbar_countdown_time +android:layout_width=0dip +android:layout_height=match_parent +android:layout_weight=1 +android:ems=10 +android:inputType=time +android:text=03:00 +/EditText + +Button +android:id=@+id/clockbar_countdown_button +android:layout_width=0dip +android:layout_height=match_parent +
[Libreoffice-commits] .: android/sdremote
android/sdremote/Makefile | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 9b71498d373408ae596371c0a0bf5aaf637cb593 Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 21 11:46:19 2012 +0300 Add a Makefile Note that sdremote does not use any LO native code, this Makefile does not need and has none of the related complexity, like those in ../experimental/*. Change-Id: Iaa9fb7f0b1a96af4283dc19a2ad125f37ba85411 diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile new file mode 100644 index 000..4727b7c --- /dev/null +++ b/android/sdremote/Makefile @@ -0,0 +1,15 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +include ../../config_host.mk + +all: + echo sdk.dir=$(ANDROID_SDK_HOME) local.properties + $(ANT) debug + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ATTENTION] Gerrit is now the primary git repo. Freedesktop is now read-only
On Tue, Aug 21, 2012 at 3:53 AM, Petr Mladek pmla...@suse.cz wrote: Norbert Thiebaud píše v So 18. 08. 2012 v 12:59 -0500: On Sat, Aug 18, 2012 at 12:15 PM, David Tardon dtar...@redhat.com wrote: Hi, It seems that some branches that had been deleted on fd.o have crept back. And they cannot be deleted again: $ git push origin :feature/gbuild_sdext remote: Processing changes: refs: 1, done To ssh://dtardon@logerrit/core ! [remote rejected] feature/gbuild_sdext (can not delete references) error: failed to push some refs to 'ssh://dtardon@logerrit/core' This seems to be an ACL issue as I was able to execute successfully that very command. Maybe we should give rights to create/delete branches and tags to more developers. Feature branches will be quite common task. Also I would imagine that distro maintainers might want to create some distro-specific tags for their releases. I already fixed that issue: Committers are allowed to create feature/* branches as for tag and other branches that is reserved to 'Steward' (you are in that group). We can certainly create a group for distro-maintainer to allow them to tag... but I don't think it is necessary to make that a generic ability. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6][Abandoned] fdo#48200 ( regression )
On 20/08/12 16:50, Petr Mladek wrote: Noel Power píše v Čt 16. 08. 2012 v 17:44 +0100: Please think about cherrypicking http://cgit.freedesktop.org/libreoffice/core/commit/?id=b94bff540a47a9fc5ce0586aa58e28321c96e4aa Yup, the variable bUseRegularExpressions is not longer set in 3-6 branch. It seems that the related methods were removed during some clean up. It work well, there = pushed into 3-6, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=f1c26949e29278a3eae0c167f172a0fd4895fd2f Hmm, the variable bUseRegularExpressions is still used on several locations in 3-5. It needs more tweaking to make it working there. I am not sure if it is worth the effort, though. lets see if there are vicious complaints, I just assumed 3-5 would be trivial, thanks for 3.6 cherry-pick! Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 21 +++---
android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
|2
2 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit e392440a2af0586638795570f17c57223177054f
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 21 11:13:04 2012 +0200
Device name now based on bluetooth name, or hardware name.
Change-Id: I0be93ff79d3dbd56bf847a081b310985c77e43f5
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index efa6514..b3fc690 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -11,6 +11,7 @@ package org.libreoffice.impressremote.communication;
import java.util.ArrayList;
import android.app.Service;
+import android.bluetooth.BluetoothAdapter;
import android.content.Intent;
import android.os.Binder;
import android.os.IBinder;
@@ -22,6 +23,21 @@ public class CommunicationService extends Service implements
Runnable {
};
/**
+ * Get the publicly visible device name -- generally the bluetooth name,
+ * however for bluetoothless devices the device model name is used.
+ *
+ * @return The device name.
+ */
+public static String getDeviceName() {
+BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
+if (aAdapter != null) {
+return aAdapter.getName();
+} else {
+return android.os.Build.MODEL;
+}
+}
+
+/**
* Used to protect all writes to mState, mStateDesired, and mServerDesired.
*/
private Object mConnectionVariableMutex = new Object();
@@ -36,11 +52,6 @@ public class CommunicationService extends Service implements
Runnable {
return Client.getPin();
}
-public String getDeviceName() {
-return Bob;
-// FIXME: get the device name somehow.
-}
-
private State mStateDesired = State.DISCONNECTED;
private Server mServerDesired = null;
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
index 1e04747..47e0e37 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/NetworkClient.java
@@ -50,7 +50,7 @@ public class NetworkClient extends Client {
mPin = aPin;
LocalBroadcastManager.getInstance(mContext).sendBroadcast(aIntent);
// Send out
-String aName = Bob; // TODO: get the proper name
+String aName = CommunicationService.getDeviceName(); // TODO: get
the proper name
sendCommand(LO_SERVER_CLIENT_PAIR\n + aName + \n + aPin
+ \n\n);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 38840 - Adding coverage analysis to unit tests
Hi, Im running into an issue I havent seen before on LibreOffice. When I do a make with LDFLAGS+='-fprofile-arcs' CFLAGS+='-fprofile-arcs -ftest-coverage' CXXFLAGS+='-fprofile-arcs -ftest-coverage' CPPFLAGS+='-fprofile-arcs -ftest-coverage' I now still get an error about undefined reference to `__gcov_merge_add' in a specific module 'odk'. Everything up until that point works as expected. I also tried specifying '-lgcov' and '-coverage', but the result is the same. When I 'make odk' I get the output below, but I have no idea what could be causing this ? Any and all help is sincerely appreciated. log for /usr/local/src/libreoffice/odk/source/unoapploader/unx Making:unoapploader /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/findsofficepath.o: In function `_GLOBAL__sub_I_65535_0_findsofficepath.c': findsofficepath.c:(.text+0x429): undefined reference to `__gcov_init' /usr/local/src/libreoffice/solver/unxlngi6.pro/lib/findsofficepath.o:(.data.rel+0x10): undefined reference to `__gcov_merge_add' collect2: error: ld returned 1 exit status dmake: Error code 1, while making '../../../unxlngi6.pro/bin/unoapploader' Regards, John Smith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Text fields in fax, letter and report templates
Hi Turi, On Mon, 2012-08-20 at 17:14 +0200, Túri István wrote: I'm trying to create unified templates for the template wizards described above. Cool :-) In detail, I would insert placeholders instead of the constant texts and make the wizards get the language dependent ones from vcl resources. Yep - makes good sense. Now, my problem is, that the three templates use some kind of TextFieldHandler stuff, which is not really clear for me. I would like to ask someone who is insider in this topic, that how is this working exactly? Does it recognize the fields written in ... ? Soo - I would be inclined to try to overload the translation magic inside the flat-ODF importer. Then there is nothing we cannot translate :-) If you poke at: filter/source/odfflatxml/OdfFlatXml.cxx And perhaps filter/source/xmlfilteradaptor/ One brutal hack (but since we control the template environment might work), might be to poke the ImportFilter to take some translation argument via it's user-data, and to load the 'inputStream' into memory, do some very raw substitution of: %%baa%% - translated-baa in each case; and then feed that stream straight into the flat odf import filter ;-) The devil is always in the details, but - might be worth a try ? ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC-UPDATE](20.08) Impress Remote -- first testing apk.
On Mon, 2012-08-20 at 23:19 +0200, John Smith wrote: Totally off topic, Im sorry, but ... but im intrigued: Could this be a good solution to store the clang static src analysis reports as well ? If so, I guess that would require me to get a account at users.freedesktop.org ? How should I go about getting that ? In general (and this is evolving) I'd prefer to keep freedesktop accounts for commiters. Again, im sorry for the off-topic question; but it just sounds like a good solution to the 'store html pages where' issue im struggling with. So we should help out with that; can you send an ssh key to Thorsten, and he can get you setup with an account on dev-builds.libreoffice.org - which is probably the right place to put this stuff. It's some great work generating it [ many thanks for that ]. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help Locating Base Code
Hi Joel, On 2012-08-20 at 09:53 -0700, Joel Madero wrote: I am still having a hard time locating the relevant code for this bug fdo#53001. I did the backtrace with the dialog open and I didn't see anything useful in there. If someone can help direct me to the relevant code OR if someone is willing to take the bug and fix it, I think it's a 20 minute fix but hours upon hours of trying to find the code has left me a bit frustrated. Having read the bug report, it says that it is a 'Link' in the file dialog. The file dialog is located in the fpicker/ subdir, so git grep Link fpicker/ | grep src fpicker/source/office/OfficeFilePicker.src:Text [ en-US ] = ~Link ; When you open it, you see that its identifier is STR_SVT_FILEPICKER_INSERT_AS_LINK; and in the output of git grep STR_SVT_FILEPICKER_INSERT_AS_LINK the is interesting is fpicker/source/office/iodlg.cxx; so looking there, it is set when SFX_EXTRA_INSERTASLINK bit is set, so grepping for that: git grep SFX_EXTRA_INSERTASLINK the interesting one seems to be fpicker/source/office/OfficeFilePicker.cxx; it is set with TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE or TemplateDescription::FILEOPEN_LINK_PREVIEW; so let's git grep for that: git grep FILEOPEN_LINK_PREVIEW and voila! - we have a hit in reportdesign: reportdesign/source/ui/report/ReportController.cxx So the code that controls this is void OReportController::insertGraphic() There is even xController-enableControl(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False/*sal_True*/); in there - so it seems to me that the code tries to disable the checkbox ;-) In the bug report, I miss the information if the bug appears with the native Windows file picker, or the LibreOffice one; if the former, I'd look around fpicker/source/win32/filepicker (here git grep CHECKBOX_LINK, probably), if the latter, then I'd try fpicker/source/office. Please let me know if you need any further help. Sorry - you've picked a not really straight-forward bug ;-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] PDF Signing Support - Final
On 08/20/2012 11:59 PM, Gökçen Eraslan wrote: At the end of the day, however, Adobe acroread shows the PDF signatures as invalid for some reason. But, it shows the certificate details correctly (which was not the case when I have used the old NSS PKCS7 API). So it seems DER/HEX encodings and the inclusion of the certificate chain are correct but there is a bug, apparently. Maybe the calculation of SHA1 or passing the private key password to NSS is wrong. I will try to figure it out soon. Yeah, acroread complains that the signature is invalid because There have been changes made to this document that invalidate the signature (plus more, but that's likely related to the throwaway self-signed cert I tested with). But great results anyway so far. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx |4
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx | 73 ++--
2 files changed, 68 insertions(+), 9 deletions(-)
New commits:
commit 1edfd9ba16f82d2f42c084137ee5ee9d549460fa
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 15 17:02:29 2012 +0100
merge in various filter work from core
Change-Id: I14ca1319e7e96941037450aee59d7a926d290c71
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
index 5f98494..8724702 100644
--- a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
@@ -53,6 +53,10 @@ GIFReader::GIFReader( SvStream rStm ) :
nLastPos( rStm.Tell() ),
nLogWidth100( 0UL ),
nLogHeight100 ( 0UL ),
+nGlobalWidth( 0 ),
+nGlobalHeight ( 0 ),
+nImageWidth ( 0 ),
+nImageHeight( 0 ),
nLoops ( 1 ),
eActAction ( GLOBAL_HEADER_READING ),
bGCTransparent ( FALSE ),
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
index 23e1114..5f05546 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
@@ -27,6 +27,7 @@
/
#include winmtf.hxx
+#include boost/scoped_array.hpp
#include rtl/crc.h
#include rtl/tencinfo.h
#include osl/endian.h
@@ -329,28 +330,54 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
case W_META_POLYPOLYGON:
{
-USHORT i, nPoly, nPoints;
-USHORT* pnPoints;
+bool bRecordOk = true;
+USHORT i, nPoly = 0, nPoints = 0;
Point* pPtAry;
// Anzahl der Polygone:
*pWMF nPoly;
// Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der
Punkte ermitteln:
-pnPoints = new USHORT[ nPoly ];
-nPoints = 0;
+boost::scoped_arrayUSHORT xPolygonPointCounts(new USHORT[nPoly]);
+USHORT* pnPoints = xPolygonPointCounts.get();
for( i = 0; i nPoly; i++ )
{
*pWMF pnPoints[i];
-nPoints = nPoints + pnPoints[i];
+
+if (pnPoints[i] SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+
+nPoints += pnPoints[i];
}
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has more
polygons than we can handle);
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
// Polygonpunkte holen:
-pPtAry = (Point*) new char[ nPoints * sizeof(Point) ];
+boost::scoped_arrayPoint xPolygonPoints(new Point[nPoints]);
+pPtAry = xPolygonPoints.get();
for ( i = 0; i nPoints; i++ )
pPtAry[ i ] = ReadPoint();
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
// PolyPolygon Actions erzeugen
PolyPolygon aPolyPoly( nPoly, pnPoints, pPtAry );
pOut-DrawPolyPolygon( aPolyPoly );
-delete[] (char*) pPtAry;
-delete[] pnPoints;
}
break;
@@ -1184,16 +1211,44 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
case W_META_POLYPOLYGON:
{
+bool bRecordOk = true;
USHORT i, nPoly, nPoints = 0;
*pStm nPoly;
for( i = 0; i nPoly; i++ )
{
-sal_uInt16 nP;
+sal_uInt16 nP = 0;
*pStm nP;
nPoints = nPoints + nP;
+if (nP SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+nPoints += nP;
}
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has
more polygons than we can handle);
+
+bRecordOk = pStm-good();
+
+if (!bRecordOk)
+{
+
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #13
On Mon, 20 Aug 2012 23:13:04 +0200, Thorsten Behrens t...@documentfoundation.org wrote: Marco Cecchetti wrote: skip You can look at the source code in the feature branch: feature/svg-export, that includes all new commits after the last master branch merging. The last commit is enough experimental. Be aware that there is still a lot of debugging code in the current implementation and a good amount of tracing info is present in the exported svg document too. Although today is hard pens-down, I'd like to ask you to clean up that branch as much as possible until code submission to Google is due (end of the month or somesuch). Debugging code is perfectly ok, if it's conditionally compiled, or defaults-off in javascript. And let's merge it to master then. Sure, no problem. A nice screencast, or demo svg with ~all the features would be cool as well - that would complement the weekly logs quite wonderfully. Well, there are all the presentation samples I created on GSoC http://users.freedesktop.org:8080/~mcecchetti/svg-export/samples/ Do you like I create a single presentation summarizing all of them ? 7- exporting embedded svg image natively, without transforming them into a bitmap and back. Let's chat about that next week, when gsoc is over - that looks like a nice, rewarding easy hack for you or another interested hacker in svg export. ;) Ok, I already tried to investigate a bit, but I don't know how I can get the image embedded into the XShape instance, check its mime type, and in case is of type image/svg extract the svg document. Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - svx/source
svx/source/svdraw/svdoashp.cxx |4 1 file changed, 4 insertions(+) New commits: commit 350d9f972e00a05ff61140eafc078188252cc2de Author: Muthu Subramanian sumu...@suse.com Date: Tue Aug 14 16:12:53 2012 +0530 fdo#47434: Zero rect. size causing wrong line positions. Thanks to Korrawit Pruegsanusak detective.conan.1...@gmail.com for the indepth analysis and debugging. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 1e66287..4359459 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3026,6 +3026,10 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix rMatrix, // build and set BaseRect (use scale) Point aPoint = Point(); Size aSize(FRound(aScale.getX()), FRound(aScale.getY())); +// fdo#47434 We need a valid rectangle here +if( !aSize.Height() ) aSize.setHeight( 1 ); +if( !aSize.Width() ) aSize.setWidth( 1 ); + Rectangle aBaseRect(aPoint, aSize); SetSnapRect(aBaseRect); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - libmspub/makefile.mk ooo.lst.in writerperfect/source
libmspub/makefile.mk|4 +--
ooo.lst.in |2 -
writerperfect/source/filter/DocumentHandler.cxx | 31
3 files changed, 30 insertions(+), 7 deletions(-)
New commits:
commit 6a92b406b03e8bbce27fe314b6229644b9fc8b0e
Author: Brennan Vincent brenn...@email.arizona.edu
Date: Fri Aug 17 18:06:09 2012 -0700
Fix writerperfect ignoring newlines.
Change-Id: Ib737a7d0ba833bcdc1e284890c62c9cf187d6b61
diff --git a/writerperfect/source/filter/DocumentHandler.cxx
b/writerperfect/source/filter/DocumentHandler.cxx
index 8336c07..e1f58b2 100644
--- a/writerperfect/source/filter/DocumentHandler.cxx
+++ b/writerperfect/source/filter/DocumentHandler.cxx
@@ -74,12 +74,35 @@ void DocumentHandler::endElement(const char *psName)
void DocumentHandler::characters(const WPXString sCharacters)
{
-OUString sCharU16(sCharacters.cstr(), strlen(sCharacters.cstr()),
RTL_TEXTENCODING_UTF8);
+int lastNewline = -1;
+int length = sCharacters.len();
+for (int curr = 0; curr length; ++curr)
+{
+if (sCharacters.cstr()[curr] == '\n')
+{
+if (curr lastNewline + 1)
+{
+OUString sCharU16(sCharacters.cstr() + lastNewline + 1, curr -
lastNewline - 1, RTL_TEXTENCODING_UTF8);
+#ifdef DEBUG_XML
+WPXString sEscapedCharacters(sCharacters, true);
+printf(%s, sEscapedCharacters.cstr());
+#endif
+mxHandler-characters(sCharU16);
+}
+startElement(text:line-break, WPXPropertyList());
+endElement(text:line-break);
+lastNewline = curr;
+}
+}
+if (lastNewline + 1 length)
+{
+OUString sCharU16(sCharacters.cstr() + lastNewline + 1, length -
lastNewline - 1, RTL_TEXTENCODING_UTF8);
#ifdef DEBUG_XML
-WPXString sEscapedCharacters(sCharacters, true);
-printf(%s, sEscapedCharacters.cstr());
+WPXString sEscapedCharacters(sCharacters, true);
+printf(%s, sEscapedCharacters.cstr());
#endif
-mxHandler-characters(sCharU16);
+mxHandler-characters(sCharU16);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c3aa1cefdc6521d34a2a32c20bae1593e1edb5ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Aug 21 12:18:44 2012 +0200
Uploading libmspub-0.0.3 release (support for MS Pub 97 and 98)
Change-Id: I6ead205a272f0167157304748d7daf8ffc9211c9
diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk
index 7d3b343..d894e20 100644
--- a/libmspub/makefile.mk
+++ b/libmspub/makefile.mk
@@ -59,8 +59,8 @@ INCPRE+=$(ZLIB_CFLAGS)
INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/zlib
.ENDIF
-TARFILE_NAME=libmspub-0.0.2
-TARFILE_MD5=8a1618d087e242bd79dcda73f291f319
+TARFILE_NAME=libmspub-0.0.3
+TARFILE_MD5=b2db54b6e96287ac995d7ed654ace4fc
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index cc88ab1..512d545 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -93,7 +93,7 @@ e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
-8a1618d087e242bd79dcda73f291f319-libmspub-0.0.2.tar.bz2
+b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
@GOOGLE_DOCS_EXTENSION_PACK@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/osl/file.hxx | 67 +++
1 file changed, 47 insertions(+), 20 deletions(-)
New commits:
commit e9febb63db2f62cd2b9505dfc4ceb3accc32aecb
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 21 12:27:12 2012 +0200
Related fdo#46249: FileStatus can have fewer fields than requested
Turns out 608fe962cc649ad62c489811d3a8666e0e06e5e7 Let osl::FileStatus
getters
assert programming errors was overly optimistic and misunderstood that
osl_getFileStatus(..., nMask) /can/ return a FileStatus for which
isValid(nMask)
is false, esp. for stuff like file names and URLs of Windows drives and
servers.
That in turn leads to existing code now calling
rtl::OUString(_aStatus.ustrFileName) etc. with null argument and crashing.
Change-Id: Icd2168e209aa1c7a6df30cd954513d01034923db
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 431685a..3d541a9 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -731,8 +731,11 @@ public:
*/
inline Type getFileType() const
{
-assert(isValid(osl_FileStatus_Mask_Type));
-return static_cast Type (_aStatus.eType);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_Type), sal,
+no FileStatus Type determined);
+return isValid(osl_FileStatus_Mask_Type)
+? static_cast Type (_aStatus.eType) : Unknown;
}
/** Is it a directory?
@@ -785,93 +788,117 @@ public:
inline sal_uInt64 getAttributes() const
{
-assert(isValid(osl_FileStatus_Mask_Attributes));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_Attributes), sal,
+no FileStatus Attributes determined);
return _aStatus.uAttributes;
}
/** Get the creation time of this file.
@return
-The creation time.
+The creation time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getCreationTime() const
{
-assert(isValid(osl_FileStatus_Mask_CreationTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_CreationTime), sal,
+no FileStatus CreationTime determined);
return _aStatus.aCreationTime;
}
/** Get the file access time.
@return
-The last access time.
+The last access time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getAccessTime() const
{
-assert(isValid(osl_FileStatus_Mask_AccessTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_AccessTime), sal,
+no FileStatus AccessTime determined);
return _aStatus.aAccessTime;
}
/** Get the file modification time.
@return
-The last modified time.
+The last modified time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getModifyTime() const
{
-assert(isValid(osl_FileStatus_Mask_ModifyTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_ModifyTime), sal,
+no FileStatus ModifyTime determined);
return _aStatus.aModifyTime;
}
/** Get the size of the file.
@return
-The actual file size.
+The actual file size if this information is valid, 0 otherwise.
*/
inline sal_uInt64 getFileSize() const
{
-assert(isValid(osl_FileStatus_Mask_FileSize));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileSize), sal,
+no FileStatus FileSize determined);
return _aStatus.uFileSize;
}
/** Get the file name.
@return
-The file name.
+The file name if this information is valid, an empty string otherwise.
*/
inline ::rtl::OUString getFileName() const
{
-assert(isValid(osl_FileStatus_Mask_FileName));
-return rtl::OUString(_aStatus.ustrFileName);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileName), sal,
+no FileStatus FileName determined);
+return isValid(osl_FileStatus_Mask_FileName)
+? rtl::OUString(_aStatus.ustrFileName) : rtl::OUString();
}
/** Get the URL of the file.
@return
-The full qualified URL of the file.
+The full qualified URL of the file if this information is valid, an
+empty string otherwise.
*/
inline ::rtl::OUString getFileURL() const
{
-assert(isValid(osl_FileStatus_Mask_FileURL));
-return rtl::OUString(_aStatus.ustrFileURL);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileURL), sal,
+no FileStatus FileURL determined);
+return isValid(osl_FileStatus_Mask_FileURL)
+? rtl::OUString(_aStatus.ustrFileURL) : rtl::OUString();
}
/** Get the link
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sal/inc
sal/inc/osl/file.hxx | 67 +++
1 file changed, 47 insertions(+), 20 deletions(-)
New commits:
commit fa4fec47a8bb713f960acb474920f2c640e1c58a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 21 12:27:12 2012 +0200
Related fdo#46249: FileStatus can have fewer fields than requested
Turns out 608fe962cc649ad62c489811d3a8666e0e06e5e7 Let osl::FileStatus
getters
assert programming errors was overly optimistic and misunderstood that
osl_getFileStatus(..., nMask) /can/ return a FileStatus for which
isValid(nMask)
is false, esp. for stuff like file names and URLs of Windows drives and
servers.
That in turn leads to existing code now calling
rtl::OUString(_aStatus.ustrFileName) etc. with null argument and crashing.
Change-Id: Icd2168e209aa1c7a6df30cd954513d01034923db
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 16f7a06..96a7cda 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -729,8 +729,11 @@ public:
*/
inline Type getFileType() const
{
-assert(isValid(osl_FileStatus_Mask_Type));
-return static_cast Type (_aStatus.eType);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_Type), sal,
+no FileStatus Type determined);
+return isValid(osl_FileStatus_Mask_Type)
+? static_cast Type (_aStatus.eType) : Unknown;
}
/** Is it a directory?
@@ -783,93 +786,117 @@ public:
inline sal_uInt64 getAttributes() const
{
-assert(isValid(osl_FileStatus_Mask_Attributes));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_Attributes), sal,
+no FileStatus Attributes determined);
return _aStatus.uAttributes;
}
/** Get the creation time of this file.
@return
-The creation time.
+The creation time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getCreationTime() const
{
-assert(isValid(osl_FileStatus_Mask_CreationTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_CreationTime), sal,
+no FileStatus CreationTime determined);
return _aStatus.aCreationTime;
}
/** Get the file access time.
@return
-The last access time.
+The last access time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getAccessTime() const
{
-assert(isValid(osl_FileStatus_Mask_AccessTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_AccessTime), sal,
+no FileStatus AccessTime determined);
return _aStatus.aAccessTime;
}
/** Get the file modification time.
@return
-The last modified time.
+The last modified time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getModifyTime() const
{
-assert(isValid(osl_FileStatus_Mask_ModifyTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_ModifyTime), sal,
+no FileStatus ModifyTime determined);
return _aStatus.aModifyTime;
}
/** Get the size of the file.
@return
-The actual file size.
+The actual file size if this information is valid, 0 otherwise.
*/
inline sal_uInt64 getFileSize() const
{
-assert(isValid(osl_FileStatus_Mask_FileSize));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileSize), sal,
+no FileStatus FileSize determined);
return _aStatus.uFileSize;
}
/** Get the file name.
@return
-The file name.
+The file name if this information is valid, an empty string otherwise.
*/
inline ::rtl::OUString getFileName() const
{
-assert(isValid(osl_FileStatus_Mask_FileName));
-return rtl::OUString(_aStatus.ustrFileName);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileName), sal,
+no FileStatus FileName determined);
+return isValid(osl_FileStatus_Mask_FileName)
+? rtl::OUString(_aStatus.ustrFileName) : rtl::OUString();
}
/** Get the URL of the file.
@return
-The full qualified URL of the file.
+The full qualified URL of the file if this information is valid, an
+empty string otherwise.
*/
inline ::rtl::OUString getFileURL() const
{
-assert(isValid(osl_FileStatus_Mask_FileURL));
-return rtl::OUString(_aStatus.ustrFileURL);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileURL), sal,
+no FileStatus FileURL determined);
+return isValid(osl_FileStatus_Mask_FileURL)
+? rtl::OUString(_aStatus.ustrFileURL)
[REVIEW 3-6][REVIEW 3-6-1] FileStatus can have fewer fields than requested
Looking into MAB https://bugs.freedesktop.org/show_bug.cgi?id=46249 CRASH when browse to HD root directory in FILEOPEN Template dialog (which apparently is crashing for yet another, unrelated reason, however), I noticed a regression introduced into LO 3.6.0 due to a misunderstanding of how osl_getFileStatus is actually working (esp. on Windows). http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9febb63db2f62cd2b9505dfc4ceb3accc32aecb Related fdo#46249: FileStatus can have fewer fields than requested is the (rather trivial) fix for that on master. Please review for backporting to libreoffice-3-6 and libreoffice-3-6-1. (I see Michael already cherry-picked it to libreoffice-3-6.) Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libmspub/libmspub-0.0.3.patch libmspub/makefile.mk
libmspub/libmspub-0.0.3.patch | 20
libmspub/makefile.mk |3 +++
2 files changed, 23 insertions(+)
New commits:
commit 6a308e8451ba3c32b203824a229e0c68f8a32cca
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Aug 21 13:01:37 2012 +0200
Fixing error: \u is not a valid universal character
Change-Id: Idfc96e5f4b31cf54fdb9734b6e3cb87d3aabc786
diff --git a/libmspub/libmspub-0.0.3.patch b/libmspub/libmspub-0.0.3.patch
new file mode 100644
index 000..c2c8ee1
--- /dev/null
+++ b/libmspub/libmspub-0.0.3.patch
@@ -0,0 +1,20 @@
+--- misc/libmspub-0.0.3/src/lib/MSPUBParser.cpp2012-08-21
11:40:41.0 +0200
misc/build/libmspub-0.0.3/src/lib/MSPUBParser.cpp 2012-08-21
12:58:58.435884355 +0200
+@@ -1151,7 +1151,7 @@
+ ParagraphStyle ret;
+
+ bool isList = false;
+- uint32_t bulletChar = '\u';
++ uint32_t bulletChar = 0;
+ NumberingType numberingType = STANDARD_WESTERN;
+ NumberingDelimiter numberingDelimiter = NO_DELIMITER;
+ boost::optionalunsigned numberIfRestarted;
+@@ -1256,7 +1256,7 @@
+ }
+ if (isList)
+ {
+-if (bulletChar != '\u')
++if (bulletChar)
+ {
+ ret.m_listInfo = ListInfo(bulletChar);
+ }
diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk
index d894e20..635d8ed 100644
--- a/libmspub/makefile.mk
+++ b/libmspub/makefile.mk
@@ -65,6 +65,9 @@ TARFILE_MD5=b2db54b6e96287ac995d7ed654ace4fc
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
+PATCH_FILES=\
+ $(TARFILE_NAME).patch
+
# --- Targets --
.INCLUDE : set_ext.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6][REVIEW 3-6-1] fdo#53280: Reset read-only UI after successful Save As
On Tue, 2012-08-21 at 10:27 +0200, Stephan Bergmann wrote:
Yes, using braces is one notable case where I deliberately deviate from
existing practice in a given file.
:-)
Anyway, even if we agree to disagree here
I think that's likely ;-)
the devilishly deceiving cases I remember all involved if-sans-braces
which originally covered a single statement plus comment (as above), so
maybe we can agree that at least in such cases it doesn't harm to add
redundant braces.
Totally with you:
if (pUnobvious)
{
// this is something complicated - wake up !
**((int **)pUnobvious) = 42;
}
looks rather sensible to me :-)
ATB,
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/CustomTarget_sdremote.mk android/Makefile android/Module_android.mk Makefile.top Module_tail_build.mk
Makefile.top |1 + Module_tail_build.mk |1 + android/CustomTarget_sdremote.mk | 19 +++ android/Makefile | 13 + android/Module_android.mk| 19 +++ 5 files changed, 53 insertions(+) New commits: commit fae45f59b85b46b01e6be7f35b7f60260d67e064 Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 21 13:52:05 2012 +0300 Add the android module to gbuild Just build the sdremote app for now. Note that this is a pure Java app with no dependencies on (native) code (or Java code, for that matter) from rest of LO. Probably should drop the separate android/sdremote/Makfile and just do what it does in android/CustomTarget_sdremote.mk instead. Adding other Android apps (well, the LibreOffice4Android one likely) to gbuild will require more complexity as they bundle native code, and thus should depend on other modules first having been built. If one wants to go really fancy, one could of course depend on the specific libraries (and other files) being bundled. Let's see... Change-Id: If10761479f348c4993eec40b7f8346edb77f0e0d diff --git a/Makefile.top b/Makefile.top index 1253984..071d37d 100644 --- a/Makefile.top +++ b/Makefile.top @@ -30,6 +30,7 @@ MathMLDTD\ Mesa\ UnoControls\ accessibility\ +android\ animations\ apple_remote\ autodoc\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index ac29fda..b6a1ef4 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,tail_end)) $(eval $(call gb_Module_add_moduledirs,tail_end,\ accessibility \ + android \ animations \ apple_remote \ autodoc \ diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk new file mode 100644 index 000..e153410 --- /dev/null +++ b/android/CustomTarget_sdremote.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +$(eval $(call gb_CustomTarget_CustomTarget,android/sdremote)) + +sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote) + +$(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done + +$(sdremote_DIR)/done : $(gb_Helper_PHONY) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) + cd $(SRCDIR)/android/sdremote $(MAKE) + +# vim: set noet sw=4 ts=4: diff --git a/android/Makefile b/android/Makefile new file mode 100644 index 000..0c6f47b --- /dev/null +++ b/android/Makefile @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/android/Module_android.mk b/android/Module_android.mk new file mode 100644 index 000..2f0d76e --- /dev/null +++ b/android/Module_android.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +$(eval $(call gb_Module_Module,android)) + +ifeq ($(OS),ANDROID) + +$(eval $(call gb_Module_add_targets,android,\ +CustomTarget_sdremote \ +)) + +endif + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6][REVIEW 3-6-1] FileStatus can have fewer fields than requested
On 21/08/12 13:01, Stephan Bergmann wrote: Looking into MAB https://bugs.freedesktop.org/show_bug.cgi?id=46249 CRASH when browse to HD root directory in FILEOPEN Template dialog (which apparently is crashing for yet another, unrelated reason, however), I noticed a regression introduced into LO 3.6.0 due to a misunderstanding of how osl_getFileStatus is actually working (esp. on Windows). http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9febb63db2f62cd2b9505dfc4ceb3accc32aecb Related fdo#46249: FileStatus can have fewer fields than requested is the (rather trivial) fix for that on master. Please review for backporting to libreoffice-3-6 and libreoffice-3-6-1. (I see Michael already cherry-picked it to libreoffice-3-6.) +1 from me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 38840 - Adding coverage analysis to unit tests
On 21/08/12 11:17, John Smith wrote: Hi, Im running into an issue I havent seen before on LibreOffice. When I do a make with LDFLAGS+='-fprofile-arcs' CFLAGS+='-fprofile-arcs -ftest-coverage' CXXFLAGS+='-fprofile-arcs -ftest-coverage' CPPFLAGS+='-fprofile-arcs -ftest-coverage' I now still get an error about undefined reference to `__gcov_merge_add' in a specific module 'odk'. Everything up until that point works as expected. I also tried specifying '-lgcov' and '-coverage', but the result is the same. When I 'make odk' I get the output below, but I have no idea what could be causing this ? Any and all help is sincerely appreciated. no idea, but the ODK/SDK isn't that important for code coverage because it doesn't contain actual office code so you can just disable it with --disable-odk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Stephan Hennig stephanhen...@arcor.de changed: What|Removed |Added Depends on||53399 --- Comment #85 from Stephan Hennig stephanhen...@arcor.de 2012-08-21 11:39:23 UTC --- Add fdo#53399, word count inconsistent and wrong with non-breaking space Rationale: 1. Since LibO 3.6, live word count statistics are prominently shown in the status line. Showing wrong numbers on the simplest documents makes for a very poor user experience. 2. Educational users (students etc.) might have to obey hard limits on the number of words in documents they write. LibreOffice's wrong numbers might get trustful users into inconvenient situations. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 bfoman bfo.bugm...@spamgourmet.com changed: What|Removed |Added Depends on||49102 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: (great) widget layout progress
Hi Caolan,
On Mon, 2012-08-20 at 17:03 +0100, Caolán McNamara wrote:
Making a bit of progress in widget layout.
It looks really beautiful to me :-) I loved the container enabling etc.
Incremental Conversion: Here's an incremental conversion from the
binary format to to .ui. In this case no code changes happen at all.
Once the .ui widget ids (and their types) match the ids that the
existing code expects then magic makes it work out of the box if the
ui is correctly named and put in the right place.
http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/cmclayouttransid=aefe9698a6982eaefdae51dbaebc15a4e0bd28a7
Wow ! that is even more awesome :-)
The idea here is that, with the right conversion utility, the .src files
could be converted to some basic glade-editable skeleton and there's no
programming ability required to knock that into shape for submission.
The submitted .ui can then be dropped in as-is, and/or code then
optimized to complete the conversion.
So - Kohei started to try to write one of these in python for the
resource files before; not sure if you're aware of that. I suspect some
of it could be re-targetted / re-used the code is here:
http://cgit.freedesktop.org/libreoffice/build/tree/scratch/layout-src2xml/README?h=libreoffice-3-4
It'd be great to resurrect / build on that if we can to automate the
container-isation; though it is rather a tricky task I suspect.
Do we have a GtkFixed style back-compat hack that will continue to
nail widgets into their places, but do it in TWIPS such that we could do
a one-shot conversion of everything and then iterate ? [ then let the
designers re-work them incrementally ].
[*] maybe the cast-happy syntax looks a bit vile. Perhaps a bit family
of get_foos_by_name, or a get_by_nameT template instead ?
So - I had a few thoughts here ;-)
http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/cmclayouttransid=064c21aec9245148e90290afd00c46b0999d19c4
One of the things I love about the new model is shrinking the
generated / dialog code-size - by killing all those bazillions of
function calls in constructors.
+ m_pDivIntervalNF =
static_castNumericField*(m_pUIBuilder-get_by_name(linesspin));
+ m_pDivRowsFT = m_pUIBuilder-get_by_name(lines);
...
I suspect it would be more efficient (if we can) to build a descriptor
of the fields (with their types), and map (and verbose-type / NULL
check) all in one place. In my experience it is remarkably common for
even programmers to tweak the XML and rename / loose widgets in such a
way that the code crashes later ;-) I'm sure as a C++ programmer there
is some magic template-ness that could do this in a single line with
better type-safety:
typedef struct {
const char *name;
void **member;
type_info type;
} CnxData;
CnxData aCnxs[] = {
{ linespin, m_pDivInternalNF, typeof(*m_pDivInternalNF) },
{ lines, m_pDivRowsFT, typeof(*m_pDivRowsFT) }
};
m_pUIBuilder-connect_data (aCnxs);
or whatever - presumably with some more macro goodness to align the
member names with the widget names:
CnxData aCnxs[] = { CNX(DivInternalNF), CNX(DivRows) };
etc. I guess glade also has this automatic signal connection goodness
that does a similar thing, and we could map to our links quite nicely -
but of course, manual connections are fine too.
Anyhow - I'm rather excited about this - it looks insanely cool :-) are
there any notable blockers stopping us getting it into master ?
Thanks !
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6-1] FileStatus can have fewer fields than requested
On Tue, 2012-08-21 at 13:01 +0200, Stephan Bergmann wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9febb63db2f62cd2b9505dfc4ceb3accc32aecb Related fdo#46249: FileStatus can have fewer fields than requested is the (rather trivial) fix for that on master. Please review for backporting to libreoffice-3-6 and libreoffice-3-6-1. (I see Michael already cherry-picked it to libreoffice-3-6.) Yep - two more for -3-6-1 - and I'd love to have it in there. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #86 from Stephan Hennig stephanhen...@arcor.de 2012-08-21 11:51:34 UTC --- (In reply to comment #85) Add fdo#53399, word count inconsistent and wrong with non-breaking space That is bug 53399. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/project.properties |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7b2a6bd0cd68d25d2781c16793cac3c205a61982
Author: Tor Lillqvist t...@iki.fi
Date: Tue Aug 21 14:53:46 2012 +0300
API level 14 should be enough for this, too
Change-Id: Id607f13b1e655e80f958da54506200ccc22c1720
diff --git a/android/sdremote/project.properties
b/android/sdremote/project.properties
index 5b5b60a..0a15e2e 100644
--- a/android/sdremote/project.properties
+++ b/android/sdremote/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-15
+target=android-14
android.library.reference.1=../abs-lib/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: gbuild support for external projects
Hi David, On 21 August 2012 09:00, David Tardon dtar...@redhat.com wrote: Hi all, I have created a new gbuild class UnpackedTarball that handles preparing sources for external project: unpacking, patching and a bit more Nice, I was considering asking about gbuildizing-external-libs status As for the rest of the external modules, my current idea is to use free-form makefile, like CustomTarget, for everything but preparation of sources. That would match the current dmake makefiles pretty well, I think... Sounds fine, I am still not sure if I am going to take part in gbuildizing these. Maybe I will help with few. The code lives on branch feature/gbuild_external. I am pretty confident it will not break on Windows, but I will not mind testers :-) If there are no violent objectives, I will merge it to master in 1-2 days. This time I am not going to test it but I had a look. You've changed cygpath -u $(TARFILE_LOCATION) to cygpath -m $(TARFILE_LOCATION), that's wrong, moreover you have forgot to use gb_UnpackedTarget_TARFILE_LOCATION ? Also seems that you don't use $(STRIP_COMPONENTS) defined in configure. Otherwise it looks really nice, also with comments :-) I'd say, fix these 2 things and then just push, thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/Makefile |2 ++ 1 file changed, 2 insertions(+) New commits: commit 15d272dfccc0e0f961fdcb190a322ad4a2e33432 Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 21 14:58:07 2012 +0300 We need the support library for ActionBarSherlock Change-Id: I211372dddc6c5b3d9f182d43fd3a89dcdff9fa22 diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile index 4727b7c..9b56380 100644 --- a/android/sdremote/Makefile +++ b/android/sdremote/Makefile @@ -10,6 +10,8 @@ include ../../config_host.mk all: echo sdk.dir=$(ANDROID_SDK_HOME) local.properties + mkdir -p ../abs-lib/libs + cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs $(ANT) debug # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - sal/inc
sal/inc/osl/file.hxx | 67 +++
1 file changed, 47 insertions(+), 20 deletions(-)
New commits:
commit 11df8085ae167e9e3df746fe107144c7ce5a7b6a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 21 12:27:12 2012 +0200
Related fdo#46249: FileStatus can have fewer fields than requested
Turns out 608fe962cc649ad62c489811d3a8666e0e06e5e7 Let osl::FileStatus
getters
assert programming errors was overly optimistic and misunderstood that
osl_getFileStatus(..., nMask) /can/ return a FileStatus for which
isValid(nMask)
is false, esp. for stuff like file names and URLs of Windows drives and
servers.
That in turn leads to existing code now calling
rtl::OUString(_aStatus.ustrFileName) etc. with null argument and crashing.
Change-Id: Icd2168e209aa1c7a6df30cd954513d01034923db
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 16f7a06..96a7cda 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -729,8 +729,11 @@ public:
*/
inline Type getFileType() const
{
-assert(isValid(osl_FileStatus_Mask_Type));
-return static_cast Type (_aStatus.eType);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_Type), sal,
+no FileStatus Type determined);
+return isValid(osl_FileStatus_Mask_Type)
+? static_cast Type (_aStatus.eType) : Unknown;
}
/** Is it a directory?
@@ -783,93 +786,117 @@ public:
inline sal_uInt64 getAttributes() const
{
-assert(isValid(osl_FileStatus_Mask_Attributes));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_Attributes), sal,
+no FileStatus Attributes determined);
return _aStatus.uAttributes;
}
/** Get the creation time of this file.
@return
-The creation time.
+The creation time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getCreationTime() const
{
-assert(isValid(osl_FileStatus_Mask_CreationTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_CreationTime), sal,
+no FileStatus CreationTime determined);
return _aStatus.aCreationTime;
}
/** Get the file access time.
@return
-The last access time.
+The last access time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getAccessTime() const
{
-assert(isValid(osl_FileStatus_Mask_AccessTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_AccessTime), sal,
+no FileStatus AccessTime determined);
return _aStatus.aAccessTime;
}
/** Get the file modification time.
@return
-The last modified time.
+The last modified time if this information is valid, an uninitialized
+TimeValue otherwise.
*/
inline TimeValue getModifyTime() const
{
-assert(isValid(osl_FileStatus_Mask_ModifyTime));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_ModifyTime), sal,
+no FileStatus ModifyTime determined);
return _aStatus.aModifyTime;
}
/** Get the size of the file.
@return
-The actual file size.
+The actual file size if this information is valid, 0 otherwise.
*/
inline sal_uInt64 getFileSize() const
{
-assert(isValid(osl_FileStatus_Mask_FileSize));
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileSize), sal,
+no FileStatus FileSize determined);
return _aStatus.uFileSize;
}
/** Get the file name.
@return
-The file name.
+The file name if this information is valid, an empty string otherwise.
*/
inline ::rtl::OUString getFileName() const
{
-assert(isValid(osl_FileStatus_Mask_FileName));
-return rtl::OUString(_aStatus.ustrFileName);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileName), sal,
+no FileStatus FileName determined);
+return isValid(osl_FileStatus_Mask_FileName)
+? rtl::OUString(_aStatus.ustrFileName) : rtl::OUString();
}
/** Get the URL of the file.
@return
-The full qualified URL of the file.
+The full qualified URL of the file if this information is valid, an
+empty string otherwise.
*/
inline ::rtl::OUString getFileURL() const
{
-assert(isValid(osl_FileStatus_Mask_FileURL));
-return rtl::OUString(_aStatus.ustrFileURL);
+SAL_INFO_IF(
+!isValid(osl_FileStatus_Mask_FileURL), sal,
+no FileStatus FileURL determined);
+
Re: [PUSHED 3-6 3-6-1] FileStatus can have fewer fields than requested
Michael Stahl píše v Út 21. 08. 2012 v 13:32 +0200: On 21/08/12 13:01, Stephan Bergmann wrote: Looking into MAB https://bugs.freedesktop.org/show_bug.cgi?id=46249 CRASH when browse to HD root directory in FILEOPEN Template dialog (which apparently is crashing for yet another, unrelated reason, however), I noticed a regression introduced into LO 3.6.0 due to a misunderstanding of how osl_getFileStatus is actually working (esp. on Windows). http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9febb63db2f62cd2b9505dfc4ceb3accc32aecb Related fdo#46249: FileStatus can have fewer fields than requested is the (rather trivial) fix for that on master. Please review for backporting to libreoffice-3-6 and libreoffice-3-6-1. (I see Michael already cherry-picked it to libreoffice-3-6.) +1 from me Yup, it looks sane and safe = pushed into 3-6-1 branch as well. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/res/layout-land/fragment_presentation.xml
| 10
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
|2
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
| 62
android/sdremote/src/org/libreoffice/impressremote/communication/TestClient.java
| 197 --
android/sdremote/src/pl/polidea/coverflow/CoverFlow.java
| 690 +-
5 files changed, 391 insertions(+), 570 deletions(-)
New commits:
commit fa3a32a8dad94378c46e98bc46ae5216959f7bdd
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 21 14:35:39 2012 +0200
Fix losing communication service on screen rotation.
Change-Id: I8ae72857ce65783fe79cd3b911b83b4c70deece6
diff --git a/android/sdremote/res/layout-land/fragment_presentation.xml
b/android/sdremote/res/layout-land/fragment_presentation.xml
index 66de905..2f04f0e 100644
--- a/android/sdremote/res/layout-land/fragment_presentation.xml
+++ b/android/sdremote/res/layout-land/fragment_presentation.xml
@@ -1,5 +1,6 @@
?xml version=1.0 encoding=utf-8?
LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
+
xmlns:app=http://schemas.android.com/apk/res/org.libreoffice.impressremote;
android:id=@+id/presentation_layout
android:layout_width=match_parent
android:layout_height=match_parent
@@ -15,9 +16,10 @@
android:id=@+id/presentation_coverflow
android:layout_width=wrap_content
android:layout_height=match_parent
-android:layout_marginTop=5dip
-coverflow:imageHeight=150dip
-coverflow:imageWidth=180dip
+android:layout_margin=5dp
+android:layout_marginLeft=10dp
+coverflow:imageHeight=200dip
+coverflow:imageWidth=240dip
coverflow:withReflection=false /
TextView
@@ -36,6 +38,8 @@
android:layout_marginRight=6dp
android:contentDescription=@string/presentation_ui_resizehandle
android:paddingBottom=5dp
+android:paddingLeft=5dp
+android:paddingRight=10dp
android:paddingTop=5dp
android:scaleType=fitXY
android:src=@drawable/handle /
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 73325bc..4d21d40 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -112,8 +112,6 @@ public class PresentationActivity extends
SherlockFragmentActivity {
mCommunicationService = ((CommunicationService.CBinder) aService)
.getService();
-mPresentationFragment
-.setCommunicationService(mCommunicationService);
mThumbnailFragment.setCommunicationService(mCommunicationService);
}
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 3b7bdca..4e90ee0 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -6,9 +6,11 @@ import org.libreoffice.impressremote.communication.SlideShow;
import pl.polidea.coverflow.AbstractCoverFlowImageAdapter;
import pl.polidea.coverflow.CoverFlow;
import android.content.BroadcastReceiver;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.ServiceConnection;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -16,6 +18,7 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.RectF;
import android.os.Bundle;
+import android.os.IBinder;
import android.support.v4.content.LocalBroadcastManager;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -39,7 +42,6 @@ public class PresentationFragment extends SherlockFragment {
private TextView mNumberText;
private CommunicationService mCommunicationService;
-private SlideShow mSlideShow;
private float mOriginalCoverflowWidth;
private float mOriginalCoverflowHeight;
@@ -47,8 +49,37 @@ public class PresentationFragment extends SherlockFragment {
private float mNewCoverflowWidth = 0;
private float mNewCoverflowHeight = 0;
+private ServiceConnection mConnection = new ServiceConnection() {
+@Override
+public void onServiceConnected(ComponentName aClassName,
+IBinder aService) {
+mCommunicationService = ((CommunicationService.CBinder) aService)
+
Re: [PUSHED 3-6-1] fdo#47434 pptx arrow import
Petr Mladek píše v Po 20. 08. 2012 v 18:10 +0200: Korrawit Pruegsanusak píše v St 15. 08. 2012 v 23:16 +0700: Hello all, I'd like to propose [1] which fix fdo#47434 to be included in -3-5, 3-6, and 3-6-1 if possible. It looks safe and works well = pushed into 3-5 and 3-6 branches: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=9b1f4aac63e0f1e5453485f8b4c36c9020bbea03 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6cbb9602e15794b4d39d2482a40c22d3fd0328f9 It is safe enough to be included in 3-6-1. Well, we need two more approvals. For the detailed explanation, please see in bugzilla starting from comment #13. Also, the unit test waiting in gerrit [2] couldn't be backported because I use XShapeDumper available only in master, and my skill isn't enough to use UNO API. ;) IMHO, it is enough to keep it in master and safe resources for other bugfixes, new unit tests, ... Got approval from Thorsten, Michael and was pushed into 3-6-1. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'load' functions in cpp unittest - are they unused?
Hello Caolán, First, sorry for a late reply. On Fri, Aug 17, 2012 at 11:33 PM, Caolán McNamara caol...@redhat.com wrote: On Fri, 2012-08-17 at 23:19 +0700, Korrawit Pruegsanusak wrote: Hello all, While I tried to create unittest with UNO API for fdo#47434 [1], I came across a function 'load' defined in sd/qa/unit/regression-test.cxx line #80: virtual bool load( const rtl::OUString rFilter, const rtl::OUString rURL, const rtl::OUString rUserData); and the function code is defined in line #239-253. Also, opengrok [2] showed this 'load' functions *seem* to be unused, because the result shown only the function definitions, without function call. SdFiltersTest inherits from test::FiltersTest and that has a FiltersTest::testDir which calls recursiveScan which calls the virtual load. In this specific case the SdFiltersTest::load isn't being used. But that's more an oversight and someone should get around to filling a dir like sw/qa/core/data/ww8 and do the same as SwFiltersTest::testCVEs for sd Thanks for the info. :-) Anyway, this sd/qa/unit/regression-test.cxx doesn't have 'testDir' function. This 'testDir', though, is in sd/qa/unit/filters-test.cxx. So, I browsed through each file in [1] and found that: the files that have 'load' function will also have 'testDir'. *Except* only two files: sd/qa/unit/regression-test.cxx (line #80) sc/qa/unit/subsequent_filters-test.cxx (line #246) which I think they are unused. Is it ok to remove both of them? [1] http://opengrok.libreoffice.org/search?q=loadproject=coredefs=refs=path=-java+-idl+-osl+qa+cxxhist= Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: IP change done
On Wed, Aug 15, 2012 at 10:14:08PM +0200, Florian Effenberger wrote: our move to a larger IP subnet for the virtual machines, especially MozTrap, is finished, thanks to the fantastic work of Robert, Alin and Uwe - thanks a lot folks, you rock! If you experience any issues with sites hosted on our virtual machines, please let me know as soon as possible. I should return and thus disconnect the old subnet by tomorrow. I dunno if it is related, but connecting to gerrit.libreoffice.org timeouts over IPv6: $ telnet gerrit.libreoffice.org 443 Trying 2a01:4f8:150:6201:b::1... Trying 78.46.154.99... Connected to gerrit.libreoffice.org. As IPv6 is usually the default (first try) for people that have IPv6 access, this looks like the website does not work, unless they have a lot of patience. Maybe someone forgot to edit the (IPv6) entries for the gerrit.libreoffice.org domain? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - android/CustomTarget_sdremote.mk android/sdremote
android/CustomTarget_sdremote.mk |4 +++- android/sdremote/Makefile|3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit d4a392476ce7b64936bbca9d62a3c59322311f67 Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 21 15:44:54 2012 +0300 Clean first for reliability. Copy the apk so push_nightlies.sh finds it Change-Id: Ie14754deb796cc2a03e48b04b31983ddd26968cb diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk index e153410..1d552f5 100644 --- a/android/CustomTarget_sdremote.mk +++ b/android/CustomTarget_sdremote.mk @@ -14,6 +14,8 @@ $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done $(sdremote_DIR)/done : $(gb_Helper_PHONY) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) - cd $(SRCDIR)/android/sdremote $(MAKE) + cd $(SRCDIR)/android/sdremote $(MAKE) clean $(MAKE) all + mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin + cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin # vim: set noet sw=4 ts=4: commit 59f7c64d248149aad773761b73f27c91fbae2962 Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 21 15:43:11 2012 +0300 Add clean target Change-Id: Iacbca078aafd44f1da254b6c8ca5be1a2cb29a88 diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile index 9b56380..5cdf8ee 100644 --- a/android/sdremote/Makefile +++ b/android/sdremote/Makefile @@ -14,4 +14,7 @@ all: cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs $(ANT) debug +clean: + $(ANT) clean + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - 2 commits - configure.in solenv/bin
configure.in |2 +- solenv/bin/concat-deps.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 59bf2b14da0be958ded27ba7c5f180290cb53489 Author: Rene Engelhard r...@debian.org Date: Mon Aug 20 10:01:47 2012 +0200 concat-deps.c: add || defined (__FreeBSD_kernel__) for arch-specifics Change-Id: Ie321ada6d2c078881fdedc61d72c94034297fea3 (cherry picked from commit 410b6f01f07f8f1a84f2118c71735cdbb5331d5f) Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 28ac2ed..aab36e4 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -39,7 +39,7 @@ #if defined(__linux) || defined(__OpenBSD__) || \ defined(__FreeBSD__) || defined(__NetBSD__) || \ -defined(__DragonFly__) +defined(__DragonFly__) || defined(__FreeBSD_kernel__) #if __BYTE_ORDER == __LITTLE_ENDIAN #define CORE_BIG_ENDIAN 0 #define CORE_LITTLE_ENDIAN 1 commit d66b8674f0fb315fbd9e1dcebdd1b658d0612d3a Author: Michael Stahl mst...@redhat.com Date: Mon Aug 20 12:41:08 2012 +0200 configure: fix S390X CPUNAME: The value was changed to S390x, presumably by accident, breaking the build (regression from 480b32d3809830002ecc28508d40af3ecd4ad272). (cherry picked from commit 8c482683edf6aee17d4718150158293461b88b3b) Change-Id: Icca90818c6363855437a273714a8317becdfd0e5 Signed-off-by: Rene Engelhard r...@debian.org Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/configure.in b/configure.in index 444cf82..95bd31c 100644 --- a/configure.in +++ b/configure.in @@ -3258,7 +3258,7 @@ linux-gnu*) ;; s390x) CPU=3 -CPUNAME=S390x +CPUNAME=S390X RTL_ARCH=S390x LIB64=lib64 OUTPATH=unxlngs390x ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/sdremote
android/sdremote/Makefile |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 8329163648555d5391eee4eab5e96652cfb2c40a Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 21 16:07:34 2012 +0300 Argh, need the local.properties in abs-lib too, and also for ant clean Change-Id: Idfb3e5f6df28a278e7b20d5b990e38751d36af68 diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile index 5cdf8ee..3fab559 100644 --- a/android/sdremote/Makefile +++ b/android/sdremote/Makefile @@ -8,13 +8,16 @@ include ../../config_host.mk -all: - echo sdk.dir=$(ANDROID_SDK_HOME) local.properties +all: properties mkdir -p ../abs-lib/libs cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs $(ANT) debug -clean: +properties: + echo sdk.dir=$(ANDROID_SDK_HOME) local.properties + echo sdk.dir=$(ANDROID_SDK_HOME) ../abs-lib/local.properties + +clean: properties $(ANT) clean # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6] Fix for fdo#48868
On 08/17/2012 04:10 PM, Kohei Yoshida wrote: Hi there, I'd like https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=e704e4691186c23e52490817d6b710ef5bf68db6 cherry-picked to 3-6 which fixes https://bugs.freedesktop.org/show_bug.cgi?id=48868 This is a regression from 3.5. It's a pretty safe change IMO. Two things were wrong that contributed to the regression. 1) when cycling through candidate values, the search started with the previous match, which is always a match (!). This caused the auto completion value to never cycle. 2) the current match position was always supposed to point to a valid candidate value, and never supposed to point to the iterator end position. That above commit fixes both, for both column value auto completion and the formula function in a tool tip. Review and cherry-pick appreciated. Ping. -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 17 -
sw/source/filter/ww8/docxattributeoutput.hxx |1 +
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 636e8f07d17f33e3b67137be805f8a0fdf3e0299
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Aug 21 07:02:46 2012 +0200
fdo#53175: Fixed the end of hyperlinks
This fixes the end of hyperlinks appearing after field ends (while the
start of hyperlink is after field start too).
Change-Id: If21b8973baaca183e0103e3a70ed98b99aa59392
(cherry picked from commit c1c2688912e769dfd7654e11e87dae380a8ce1eb)
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 71d39af..34e383c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -573,6 +573,7 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
m_pHyperlinkAttrList = NULL;
+m_startedHyperlink = true;
}
DoWriteBookmarks( );
@@ -588,16 +589,21 @@ void DocxAttributeOutput::EndRun()
WritePostponedMath();
+if ( m_closeHyperlinkInThisRun )
+{
+if ( m_startedHyperlink )
+{
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_startedHyperlink = false;
+}
+m_closeHyperlinkInThisRun = false;
+}
+
while ( m_Fields.begin() != m_Fields.end() )
{
EndField_Impl( m_Fields.front( ) );
m_Fields.erase( m_Fields.begin( ) );
}
-if ( m_closeHyperlinkInThisRun )
-{
-m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_closeHyperlinkInThisRun = false;
-}
// if there is some redlining in the document, output it
EndRedline();
@@ -4375,6 +4381,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_pParentFrame( NULL ),
m_closeHyperlinkInThisRun( false ),
m_closeHyperlinkInPreviousRun( false ),
+ m_startedHyperlink( false ),
m_postponedGraphic( NULL ),
m_postponedMath( NULL ),
m_postitFieldsMaxId( 0 ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 788905f..db78516 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -590,6 +590,7 @@ private:
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;
+bool m_startedHyperlink;
struct PostponedGraphic
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #87 from Roman Eisele b...@eikota.de 2012-08-21 13:39:59 UTC --- (In reply to comment #85) 2. Educational users (students etc.) might have to obey hard limits on the number of words in documents they write. LibreOffice's wrong numbers might get trustful users into inconvenient situations. I ought to support this. At the first glance, correct or incorrect word count seems to be a minor issue. But in the academic (and probably also in the journalistic?!) world word count is an extremely important entity, sometimes of vital importance (Yes, your essay was very very good, but it was three words too long, so you can only get a C grade ...). So, bug 53399 is really important. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: android/sdremote
android/sdremote/res/layout-land/fragment_presentation.xml |
11 ++--
android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java |
10 ++-
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
27 ++
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
3 -
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java |
7 +-
5 files changed, 36 insertions(+), 22 deletions(-)
New commits:
commit 2f88fd3f94702edff29e212771d5d1922566aa94
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Aug 21 15:40:45 2012 +0200
Further style fixes + use Local BroadcastManager.
Change-Id: I2af6acbcb27c6c8000e638ac5414fa1d89583b1c
diff --git a/android/sdremote/res/layout-land/fragment_presentation.xml
b/android/sdremote/res/layout-land/fragment_presentation.xml
index 2f04f0e..7ac884b 100644
--- a/android/sdremote/res/layout-land/fragment_presentation.xml
+++ b/android/sdremote/res/layout-land/fragment_presentation.xml
@@ -1,6 +1,5 @@
?xml version=1.0 encoding=utf-8?
LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
-
xmlns:app=http://schemas.android.com/apk/res/org.libreoffice.impressremote;
android:id=@+id/presentation_layout
android:layout_width=match_parent
android:layout_height=match_parent
@@ -8,16 +7,18 @@
LinearLayout
android:layout_width=wrap_content
-android:layout_height=match_parent
+android:layout_height=wrap_content
+android:layout_gravity=center_vertical
android:orientation=vertical
pl.polidea.coverflow.CoverFlow
xmlns:coverflow=http://schemas.android.com/apk/res/org.libreoffice.impressremote;
android:id=@+id/presentation_coverflow
android:layout_width=wrap_content
-android:layout_height=match_parent
+android:layout_height=wrap_content
+android:layout_gravity=center_vertical
android:layout_margin=5dp
-android:layout_marginLeft=10dp
+android:layout_marginLeft=15dp
coverflow:imageHeight=200dip
coverflow:imageWidth=240dip
coverflow:withReflection=false /
@@ -26,7 +27,7 @@
android:id=@+id/presentation_slidenumber
android:layout_width=wrap_content
android:layout_height=wrap_content
-android:layout_gravity=center_horizontal
+android:layout_gravity=center_horizontal|center_vertical
android:text= /
/LinearLayout
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
index e01a909..76641f9 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PairingActivity.java
@@ -28,7 +28,6 @@ import com.actionbarsherlock.app.SherlockActivity;
public class PairingActivity extends SherlockActivity {
private CommunicationService mCommunicationService;
-private boolean mIsBound = false;
private TextView mPinText;
/** Called when the activity is first created. */
@@ -38,7 +37,6 @@ public class PairingActivity extends SherlockActivity {
bindService(new Intent(this, CommunicationService.class), mConnection,
Context.BIND_IMPORTANT);
-mIsBound = true;
IntentFilter aFilter = new IntentFilter(
CommunicationService.MSG_PAIRING_STARTED);
@@ -48,6 +46,12 @@ public class PairingActivity extends SherlockActivity {
}
+@Override
+protected void onPause() {
+super.onPause();
+unbindService(mConnection);
+}
+
private ServiceConnection mConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName aClassName,
@@ -60,7 +64,7 @@ public class PairingActivity extends SherlockActivity {
.setText(MessageFormat
.format(getResources()
.getString(R.string.pairing_instructions_2_deviceName),
-
mCommunicationService
+
CommunicationService
.getDeviceName()));
if (mCommunicationService.getState() == State.CONNECTING) {
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 4d21d40..a99b9cc 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
[Libreoffice-commits] .: oox/source
oox/source/drawingml/table/tablecell.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 309658bd85fd21daade42be1f1909d944a1e8c20 Author: Muthu Subramanian sumu...@suse.com Date: Fri Aug 17 16:13:56 2012 +0530 Reverting superfluous commit 36233b158b5de6c474f06c8c8772f0012b191baa w.r.t David Tardon's suggestion, table cell now always has textbody. commit: 772699ac1f2375c33f0819ebb127555d3178c4e5 Hence reverting this. diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 7675c10..c89a4f9 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -358,8 +358,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() ); PropertySet( xPropSet ).setProperties( aPropMap ); -if( getTextBody() ) -getTextBody()-insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle ); +getTextBody()-insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle ); } } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: REMINDER: Release 3.6.0-rc2 from libreoffice-3-6-1 branch
ape píše v Po 20. 08. 2012 v 23:05 -0700: Hi, Peter! Cedric fixed Bug 53175 [FILEOPEN error reading Content (TOC) from a DOCX] today. I think that this commit should be made to LibO-3.6.1rc2 (final), because the fix Bug 52610 [FILESAVE particular document as. Docx (Office Open): Can not be opened with other office software] was included in the LibO-3.6.1rc1. The fix for Bug 53175 [FILEOPEN error reading Content (TOC) from a DOCX] has been pushed into the 3-6-1 branch as well now. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #88 from Roman Eisele b...@eikota.de 2012-08-21 13:47:15 UTC --- Supplement: bfoman has added bug 49102 -- Writer: Incorrect numbering when cells are merged in the table, still waiting for confirmation. This is a LibO 3.5.x bug which went wrong in LibO 3.6.x (maybe it would be better if there were two separate bug reports, one for the 3.5.x problem and one for the additional 3.6.x regression). -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in |9 - 1 file changed, 9 deletions(-) New commits: commit 683f8c2fa7050b788b06fd3fe0b4624e7b4befef Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Aug 21 16:50:10 2012 +0300 --enable-dbgutil doesn't cause -D_DEBUG any more Change-Id: Ibe0e22e384643b81698a426c2870be76c107d3d2 diff --git a/configure.in b/configure.in index 3a52117..5954209 100644 --- a/configure.in +++ b/configure.in @@ -2929,15 +2929,6 @@ if test -n $enable_dbgutil -a $enable_dbgutil != no; then else with_system_mysql_cppconn=no fi -if test $_os = WINNT -a \ -\( $enable_mozilla != no -o \ - $enable_build_mozilla != no \); then -# We can't build against the Mozilla stuff if using _DEBUG, will get linking errors -# See connectivity/drivers/mozab -AC_MSG_WARN([Also disabling Mozilla stuff then]) -enable_mozilla=no -enable_build_mozilla=no -fi else PRODUCT=full PROEXT=.pro ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/inc basic/source
basic/inc/basic/sbstar.hxx|2 +-
basic/source/classes/sb.cxx |8
basic/source/classes/sbintern.cxx |8
basic/source/classes/sbunoobj.cxx | 14 +++---
basic/source/classes/sbxmod.cxx |8
basic/source/inc/runtime.hxx | 31 +++
basic/source/inc/sbintern.hxx |8
basic/source/inc/sbunoobj.hxx |4 ++--
basic/source/inc/scriptcont.hxx |4 ++--
basic/source/runtime/iosys.cxx| 30 +++---
basic/source/runtime/runtime.cxx | 16
basic/source/runtime/step0.cxx|4 ++--
basic/source/runtime/step1.cxx|2 +-
basic/source/runtime/step2.cxx| 18 +-
basic/source/uno/scriptcont.cxx | 12 ++--
15 files changed, 84 insertions(+), 85 deletions(-)
New commits:
commit 2efc59c9b6174e9b4b148a1c12dc8c5aac11865f
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Aug 21 22:54:26 2012 +0900
sal_Bool to bool
Change-Id: I38141187c4f0809343a93c5765c0773d2321968a
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 6a75304..68765f4 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -148,7 +148,7 @@ public:
static void MakeErrorText( SbError, const ::rtl::OUString aMsg );
static constString GetErrorText();
static SbError GetErrorCode();
-static sal_Bool IsCompilerError();
+static bool IsCompilerError();
static sal_uInt16 GetVBErrorCode( SbError nError );
static SbError GetSfxFromVBError( sal_uInt16 nError );
sal_BoolIsBreak() const { return bBreak; }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 1a625bd..06ec026 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1416,7 +1416,7 @@ sal_uInt16 StarBASIC::GetCol2() { return
GetSbData()-nCol2; }
// Specific to error handler
SbError StarBASIC::GetErrorCode() { return GetSbData()-nCode; }
const String StarBASIC::GetErrorText() { return GetSbData()-aErrMsg; }
-sal_Bool StarBASIC::IsCompilerError() { return GetSbData()-bCompiler; }
+bool StarBASIC::IsCompilerError() { return GetSbData()-bCompiler; }
// From 1996-03-29:
// The mapping between the old and the new error codes take place by searching
@@ -1597,7 +1597,7 @@ sal_Bool StarBASIC::CError
}
// set flag, so that GlobalRunInit notice the error
-GetSbData()-bGlobalInitErr = sal_True;
+GetSbData()-bGlobalInitErr = true;
// tinker the error message
MakeErrorText( code, rMsg );
@@ -1607,13 +1607,13 @@ sal_Bool StarBASIC::CError
code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
SetErrorData( code, l, c1, c2 );
-GetSbData()-bCompiler = sal_True;
+GetSbData()-bCompiler = true;
sal_Bool bRet;
if( GetSbData()-aErrHdl.IsSet() )
bRet = (sal_Bool) GetSbData()-aErrHdl.Call( this );
else
bRet = ErrorHdl();
-GetSbData()-bCompiler = sal_False; // only true for error handler
+GetSbData()-bCompiler = false; // only true for error handler
return bRet;
}
diff --git a/basic/source/classes/sbintern.cxx
b/basic/source/classes/sbintern.cxx
index 292897b..fb3f802 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -49,11 +49,11 @@ SbiGlobals::SbiGlobals()
nCode = 0;
nLine = 0;
nCol1 = nCol2 = 0;
-bCompiler = sal_False;
-bGlobalInitErr = sal_False;
-bRunInit = sal_False;
+bCompiler = false;
+bGlobalInitErr = false;
+bRunInit = false;
pTransliterationWrapper = NULL;
-bBlockCompilerError = sal_False;
+bBlockCompilerError = false;
pAppBasMgr = NULL;
pMSOMacroRuntimLib = NULL;
}
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index b9ec529..6005c7a 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2306,7 +2306,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster rBC, const
TypeId rBCType,
}
// call the method
-GetSbData()-bBlockCompilerError = sal_True; // #106433 Block
compiler errors for API calls
+GetSbData()-bBlockCompilerError = true; // #106433 Block
compiler errors for API calls
try
{
if( !bInvocation mxUnoAccess.is() )
@@ -2350,7 +2350,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster rBC, const
TypeId rBCType,
{
implHandleAnyException( ::cppu::getCaughtException() );
}
-GetSbData()-bBlockCompilerError = sal_False; // #106433
Unblock compiler errors
+GetSbData()-bBlockCompilerError = false; // #106433 Unblock
compiler errors
}
}
else
@@ -2361,8 +2361,8 @@ void
[Libreoffice-commits] .: libmspub/libmspub-0.0.3.patch
libmspub/libmspub-0.0.3.patch | 24
1 file changed, 24 insertions(+)
New commits:
commit f4d996ceaa4d127b37868a47b302d466193a3cbc
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Aug 21 17:01:20 2012 +0300
Fix MSVC build
Change-Id: I0cbfe470ccd8850d9bf5826324a5b66698a547da
diff --git a/libmspub/libmspub-0.0.3.patch b/libmspub/libmspub-0.0.3.patch
index c2c8ee1..26a9627 100644
--- a/libmspub/libmspub-0.0.3.patch
+++ b/libmspub/libmspub-0.0.3.patch
@@ -1,5 +1,15 @@
--- misc/libmspub-0.0.3/src/lib/MSPUBParser.cpp2012-08-21
11:40:41.0 +0200
+++ misc/build/libmspub-0.0.3/src/lib/MSPUBParser.cpp 2012-08-21
12:58:58.435884355 +0200
+@@ -52,7 +52,9 @@
+ #include TableInfo.h
+ #include VerticalAlign.h
+
++#if !defined(_MSC_VER) !defined(BOOST_CSTDINT_HPP)
+ using boost::int32_t;
++#endif
+ using boost::uint32_t;
+
+ libmspub::MSPUBParser::MSPUBParser(WPXInputStream *input, MSPUBCollector
*collector)
@@ -1151,7 +1151,7 @@
ParagraphStyle ret;
@@ -18,3 +28,17 @@
{
ret.m_listInfo = ListInfo(bulletChar);
}
+--- misc/libmspub-0.0.3/src/lib/libmspub_utils.h
misc/build/libmspub-0.0.3/src/lib/libmspub_utils.h
+@@ -43,7 +43,11 @@
+
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
++#ifndef BOOST_CSTDINT_HPP
+ typedef unsigned uint32_t;
++#endif
++typedef signed char int8_t;
++typedef short int16_t;
+ typedef int int32_t;
+ typedef unsigned __int64 uint64_t;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 sebast...@sspaeth.de sebast...@sspaeth.de changed: What|Removed |Added Blocks||51550 --- Comment #89 from sebast...@sspaeth.de sebast...@sspaeth.de 2012-08-21 14:14:39 UTC --- Adding bug #51550. DATALOSS of embedded OLE objects when saving as .docx, ie. charts, spreadsheets,... -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 sebast...@sspaeth.de sebast...@sspaeth.de changed: What|Removed |Added Depends on||51550 Blocks|51550 | --- Comment #90 from sebast...@sspaeth.de sebast...@sspaeth.de 2012-08-21 14:15:43 UTC --- Arrg, depending on bug #51550, not blocking it. Sorry -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unotext.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 12ce1c3a06e07f16fefe11fce9ae35c94ef657e7
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 21 16:15:09 2012 +0200
n#775899 SwXText::convertToTextFrame fix removing fake paragraph
In case the textrange contains a single table, the DelFullPara() call to
remove the ending fake paragraph failed. When this happens, we now find
the paragraph in question manually to delete it.
Change-Id: I7055d4489192a8a694aef118f7646d8db87a64df
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index a36cc9c..a8b91c8 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1755,7 +1755,14 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
if (bParaAfterInserted)
{
xFrameTextCursor-gotoEnd(sal_False);
-m_pImpl-m_pDoc-DelFullPara(*pFrameCursor-GetPaM());
+if (!m_pImpl-m_pDoc-DelFullPara(*pFrameCursor-GetPaM()))
+{
+// In case the frame has a table only, the cursor points to
the end of the first cell of the table.
+SwPaM
aPaM(*pFrameCursor-GetPaM()-GetNode()-FindSttNodeByType(SwFlyStartNode)-EndOfSectionNode());
+// Now we have the end of the frame -- the node before that
will be the paragraph we want to remove.
+aPaM.GetPoint()-nNode--;
+m_pImpl-m_pDoc-DelFullPara(aPaM);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/qa
sd/qa/unit/data/pptx/fdo47434-all.pptx |binary sd/qa/unit/data/pptx/xml/fdo47434_page0.xml | 139 sd/qa/unit/regression-test.cxx | 10 ++ 3 files changed, 149 insertions(+) New commits: commit affa362c8dcd8e9eada5dbf6967cd278565abf4e Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com Date: Tue Aug 21 20:08:40 2012 +0530 fdo#47434 testcase Change-Id: Ib69fa1fff94b7a3403a45fb948ff9e7b1ebc4f0f diff --git a/sd/qa/unit/data/pptx/fdo47434-all.pptx b/sd/qa/unit/data/pptx/fdo47434-all.pptx new file mode 100644 index 000..1ecb8a9 Binary files /dev/null and b/sd/qa/unit/data/pptx/fdo47434-all.pptx differ diff --git a/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml b/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml new file mode 100644 index 000..281441e --- /dev/null +++ b/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml @@ -0,0 +1,139 @@ +?xml version=1.0? +XShapes + XShape positionX=5358 positionY=4366 sizeX= sizeY=1 type=com.sun.star.drawing.CustomShape name=Straight Arrow Connector 4 textAutoGrowHeight=false textAutoGrowWidth=false textContourFrame=false textFitToSize=NONE textHorizontalAdjust=BLOCK textVerticalAdjust=TOP textLeftDistance=250 textRightDistance=250 textUpperDistance=125 textLowerDistance=125 textMaximumFrameHeight=0 textMaximumFrameWidth=0 textMinimumFrameHeight=0 textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0 textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE textAnimationStartInside=false textAnimationStopInside=false textWritingMode=LR_TB fillStyle=NONE fillColor=13625333 fillTransparence=0 fillTransparenceGradientName= + FillTransparenceGradient style=LINEAR startColor=0 endColor=16777215 angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100 stepCount=0/ + FillGradient style=LINEAR startColor=8421504 endColor=16777215 angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100 stepCount=0/ + FillHatch style=SINGLE color=8421504 distance=20 angle=0/ + FillBitmap width=32 height=32/ + LineDash style=RECT dots=1 dotLen=20 dashes=1 dashLen=20 distance=20/ + LineStart/ + LineEnd + pointSequence +point positionX=225 positionY=0 polygonFlags=NORMAL/ +point positionX=450 positionY=409 polygonFlags=NORMAL/ +point positionX=382 positionY=450 polygonFlags=NORMAL/ +point positionX=225 positionY=162 polygonFlags=NORMAL/ +point positionX=67 positionY=450 polygonFlags=NORMAL/ +point positionX=0 positionY=409 polygonFlags=NORMAL/ +point positionX=225 positionY=0 polygonFlags=NORMAL/ + /pointSequence + /LineEnd + Transformation + Line1 column1=5556.00 column2=0.00 column3=5358.00/ + Line2 column1=0.00 column2=2.00 column3=4366.00/ + Line3 column1=0.00 column2=0.00 column3=1.00/ + /Transformation + CustomShapeGeometry + PropertyValue name=IsPostRotateAngle handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=MirroredX handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=MirroredY handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=TextPreRotateAngle handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=Type handle=0 value=mso-spt32 propertyState=DIRECT_VALUE/ + PropertyValue name=AdjustmentValues handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=ViewBox handle=0 propertyState=DIRECT_VALUE/ + PropertyValue name=Path handle=0 propertyState=DIRECT_VALUE/ + /CustomShapeGeometry + /XShape + XShape positionX=5356 positionY=5159 sizeX= sizeY=1 type=com.sun.star.drawing.CustomShape name=Straight Arrow Connector 5 textAutoGrowHeight=false textAutoGrowWidth=false textContourFrame=false textFitToSize=NONE textHorizontalAdjust=BLOCK textVerticalAdjust=TOP textLeftDistance=250 textRightDistance=250 textUpperDistance=125 textLowerDistance=125 textMaximumFrameHeight=0 textMaximumFrameWidth=0 textMinimumFrameHeight=0 textMinimumFrameWidth=0 textAnimationAmount=0 textAnimationCount=0 textAnimationDelay=0 textAnimationDirection=LEFT textAnimationKind=NONE textAnimationStartInside=false textAnimationStopInside=false textWritingMode=LR_TB fillStyle=NONE fillColor=13625333 fillTransparence=0 fillTransparenceGradientName= + FillTransparenceGradient style=LINEAR startColor=0 endColor=16777215 angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100 stepCount=0/ + FillGradient style=LINEAR startColor=8421504 endColor=16777215 angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100 stepCount=0/ + FillHatch style=SINGLE color=8421504 distance=20 angle=0/ + FillBitmap width=32 height=32/ + LineDash style=RECT dots=1 dotLen=20 dashes=1 dashLen=20 distance=20/ + LineStart/ + LineEnd + pointSequence +point positionX=225 positionY=0 polygonFlags=NORMAL/ +point positionX=450 positionY=409 polygonFlags=NORMAL/ +point positionX=382 positionY=450 polygonFlags=NORMAL/
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/tabsplit.hxx |8 +--
sc/source/ui/inc/tabview.hxx |1
sc/source/ui/view/tabsplit.cxx | 92 -
sc/source/ui/view/tabview.cxx |1
4 files changed, 96 insertions(+), 6 deletions(-)
New commits:
commit 25ef6ea63ac2d329b510e921d013f6382b280673
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Sun Jul 29 16:00:22 2012 +0200
Really draw Calc tab-splitters
Change-Id: I952729487eb5d1195bbdf53c2e981685cd0c7b62
Reviewed-on: https://gerrit.libreoffice.org/350
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx
index cdfa148..616bd0b 100644
--- a/sc/source/ui/inc/tabsplit.hxx
+++ b/sc/source/ui/inc/tabsplit.hxx
@@ -28,14 +28,13 @@ class ScViewData;
class ScTabSplitter : public Splitter
{
private:
-ScViewData* pViewData;
-sal_BoolbFixed;
+const ScViewData *const pViewData;
+boolbFixed;
protected:
virtual voidMouseMove( const MouseEvent rMEvt );
virtual voidMouseButtonUp( const MouseEvent rMEvt );
virtual voidMouseButtonDown( const MouseEvent rMEvt );
-
virtual voidSplitting( Point rSplitPos );
public:
@@ -43,7 +42,8 @@ public:
ScViewData* pData );
~ScTabSplitter();
-voidSetFixed(sal_Bool bSet);
+voidSetFixed(bool bSet);
+virtual voidPaint( const Rectangle rPaintRect );
};
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 6d75481..4d2a540 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -63,7 +63,6 @@ namespace chart2 { namespace data {
struct HighlightedRange;
}
-#define SPLIT_HANDLE_SIZE 3
#define SC_FORCEMODE_NONE 0xff
// ---
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 05d0405..5c5f2ff 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -82,7 +82,7 @@ void ScTabSplitter::Splitting( Point rSplitPos )
}
-void ScTabSplitter::SetFixed(sal_Bool bSet)
+void ScTabSplitter::SetFixed(bool bSet)
{
bFixed = bSet;
if (bSet)
@@ -93,6 +93,96 @@ void ScTabSplitter::SetFixed(sal_Bool bSet)
SetPointer(POINTER_VSPLIT);
}
+void ScTabSplitter::Paint( const Rectangle rRect )
+{
+const Color oldFillCol = GetFillColor();
+const Color oldLineCol = GetLineColor();
+
+if (IsHorizontal())
+{
+switch (pViewData-GetHSplitMode())
+{
+case SC_SPLIT_NONE:
+{
+// Draw 3D border
+
SetLineColor(GetSettings().GetStyleSettings().GetShadowColor());
+DrawLine(rRect.TopRight(), rRect.BottomRight());
+DrawLine(rRect.BottomLeft(), rRect.BottomRight());
+SetLineColor(GetSettings().GetStyleSettings().GetLightColor());
+DrawLine(rRect.TopLeft(), rRect.TopRight());
+DrawLine(rRect.TopLeft(), rRect.BottomLeft());
+// Fill internal rectangle
+SetLineColor();
+SetFillColor(GetSettings().GetStyleSettings().GetFaceColor());
+DrawRect(Rectangle(rRect.Left()+1, rRect.Top()+1,
rRect.Right()-1, rRect.Bottom()-1));
+// Draw handle
+SetLineColor(Color(COL_BLACK));
+SetFillColor(Color(COL_BLACK));
+const long xc = rRect.Right()+rRect.Left();
+const long h4 = rRect.GetHeight()/4;
+// First xc fraction is truncated, second one is rounded. This
will draw a centered line
+// in handlers with odd width and a centered rectangle in
those with even width.
+DrawRect(Rectangle(Point(xc/2, rRect.Top()+h4),
Point((xc+1)/2, rRect.Bottom()-h4)));
+break;
+}
+case SC_SPLIT_NORMAL:
+SetLineColor(GetSettings().GetStyleSettings().GetLightColor());
+DrawLine(rRect.TopLeft(), rRect.BottomLeft());
+
SetLineColor(GetSettings().GetStyleSettings().GetShadowColor());
+DrawLine(rRect.TopRight(), rRect.BottomRight());
+SetLineColor();
+SetFillColor(GetSettings().GetStyleSettings().GetFaceColor());
+DrawRect(Rectangle(Point(rRect.Left()+1, rRect.Top()),
Point(rRect.Right()-1, rRect.Bottom(;
+break;
+case SC_SPLIT_FIX:
+// Nothing to draw
+break;
+}
+}
+else
+{
+switch (pViewData-GetVSplitMode())
+{
+case SC_SPLIT_NONE:
+{
+// Draw 3D border
+
[PUSHED] fdo#47434 testcase
From Muthu Subramanian K muthus...@gmail.com: Muthu Subramanian K has submitted this change and it was merged. Change subject: fdo#47434 testcase .. fdo#47434 testcase Change-Id: Ib69fa1fff94b7a3403a45fb948ff9e7b1ebc4f0f --- A sd/qa/unit/data/pptx/fdo47434-all.pptx A sd/qa/unit/data/pptx/xml/fdo47434_page0.xml M sd/qa/unit/regression-test.cxx 3 files changed, 149 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/421 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib69fa1fff94b7a3403a45fb948ff9e7b1ebc4f0f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Really draw Calc tab-splitters
From Eike Rathke er...@redhat.com: Eike Rathke has submitted this change and it was merged. Change subject: Really draw Calc tab-splitters .. Really draw Calc tab-splitters Change-Id: I952729487eb5d1195bbdf53c2e981685cd0c7b62 --- M sc/source/ui/inc/tabsplit.hxx M sc/source/ui/inc/tabview.hxx M sc/source/ui/view/tabsplit.cxx M sc/source/ui/view/tabview.cxx 4 files changed, 96 insertions(+), 6 deletions(-) Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/350 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I952729487eb5d1195bbdf53c2e981685cd0c7b62 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Matteo Casalin matteo.casa...@gmx.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.1.2'
Tag 'libreoffice-3.6.1.2' created by Petr Mladek pmla...@suse.cz at 2012-08-21 15:44 -0700 Tag libreoffice-3.6.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQM57eAAoJEPQ0oe+v7q6jxvEQAKq2Y6eedILng4yQ6hnraoFN /PARlgDOffTKanZH3k2JeGO0t7XbrBenDNp1IH5jOfwBFJjBQsMMk7MoENBVSVkE WEU4V4agoBk0/5N7Vjx58ivUiJtFQJne/K33zAhhgD1ES8wjvb3ChBx0FfoN54dB P1YvR6T/2ccGOqw0aGVyD44Yh0WQcSr5RXu6eX8Q3iov6PugZAtcZlYm5gmZ9p+j b3XOleLJmg/Tum3e14qCebHfi8+ts7ATiEdlnLoxY7jPO+aukzh8DJavFnfNfC5O +myVRBzuApU0IATSA4uiJctlNQO538jzieHa6iK5Jg0054wOFQ44Mgy5Fn9P+5xX GODkwWOHGeNDNtWPBlfGaHcB2XY1ABuwlqTltCyCv5Awy9q1b/obQEz9dSHgP0rS /mIR7/6d2OtTAQ3XMvDQMrA41DSXLre1bYPkLGmIu5FEYO/TVlWYlsbjzh8453y2 p/lawNqyAN4/Vub+eOT+0t0pAc1aPnxNl/m4XGVHaF7rw/8JJ8Q5X1osVKtSwhk7 TijZfu64IXG2MWVQxVFoSnba6vO7gRl97IxAv777Y3mAJJ1MBvHoEdg8llIhlvxQ LP2ntlsZQGPPeHr+zCLoC6v0EDzMGYJbArYhifQw2Q5puHrovAfQuF4llbrKNmFC qyXS8DeCDngzgwPnocky =M2Q6 -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-609: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.1.2'
Tag 'libreoffice-3.6.1.2' created by Petr Mladek pmla...@suse.cz at 2012-08-21 15:44 -0700 Tag libreoffice-3.6.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQM57eAAoJEPQ0oe+v7q6jr9AQAIIKzRCghUgDiLi0UBbYC/lR +siRLs9zc+nVA6GLwLGT1N6aOp6z4PNFwrD0mF/K0MchD5da5bWIWrnuEnItR1IQ /b2ghrXYTLZaIg3e9m/SlWxaH/P8PcM22k2Oa1ZkLqFo9W+X1KUebXQFMa5l3ESB iNaW4nn3DK+lfHsVcTj6xX6wCjpAmBCxVyfpqCnObPRQA86rfCPmS/c2wbsCdGfL xQ1UdN3sthdt9HRf8meevlqRYApmerFXTdgZqmLcdiDGXV3lJaTrhkYQCD/t/fJy bqjBAEoBqcRgVqmr7Laji/YcIDnDxkNtBzx/cuW2sD7UOP0tBdw2nwM8E6s2EP4k MULlMRFWs3Ioy27w3IKAMDhH2dfdTGVT1eSBnP/em+ath6GLqNy8syUveBhtmnTM TrIWCSvLwp2iryCbfdTmTwjTFWU0qEg/4rT3sB8Ayb8WlmM5e+ywQVJmfG6HqX2e 6xScqdAJk5jJuZqNuptg/5EAt5QKTAuwafQuQPcS6qo4GwZHfW3zcHwY2io4f73o cOz5EW9BvbiSjBbyUafkdJZZhRiKkR63c++K3vnINsj4i6+fbWVa9RPeqkmVoSdD 4zWBQ41XlCDLlHyykiqbV0GYOnmYlSzo1vxVhU9ajsoUnBuV+G9Kv3NiO/ZUTslD 78p3ifo/wpkl9XRzezRA =tGn0 -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.1.2'
Tag 'libreoffice-3.6.1.2' created by Petr Mladek pmla...@suse.cz at 2012-08-21 15:44 -0700 Tag libreoffice-3.6.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQM57eAAoJEPQ0oe+v7q6jH50P/0tOyY6NIrqLh5hYdFhBnULk 6iYUGGc6KRWIKnUToPjzSkA//AW7MVBHYYyiQFh+LgmAHavbU3rrKsDWjh+aUeAO pit56YQVSwM2yPoosQs8MV97WmUr5ESQe5UYwSCmAPuHyeloZCVkGBBvGmF+VWE6 QO1Krg9N805EP23s2I0rPhpGZ4+JGll4QOLWwx9IvlZxk9eA3ez/dqm2YRx9j1up GeCNQLiVKxKWCDVFbengI4E0b3zLlxw4jPw7QqHwyeyj3b5jVrj0covBarUf+QnJ XzFuf2+XuXcXGvxG8sVI92IWF2lRiLZyqjIBve8GY1MKj1prqdZBm9DVB+cfr1Ow SE3MZHKMRFFBZJQ2WFSez9o6lvycRBRUahJBiE1SCfciARsC4IuVXPPc8zx5gpS/ vfkyODLWYXMAy9+h2I/cFMRXrGJBK0RB/sL666PKWg4NB2hpLlAq/tKFJlm0Dk7u pLq70aNmEB3IZwoT1eYpuw4wrtA+RG/ztOvvCHeXgbhrTgHIjzTnshAB93D3rYn5 pY2eeKHSNAT7wXa8IHGzmF5Zl7AE2kunMP5D0v7wGzTes0MH8C6yO2bFS5YbLcuh gCRDiK1BFRUwbTxGO7OBhb0qZ/h/kpaMlxDstuPyaBI61pIIGE8NphsbujWzZ2+U ORWBqiXkhdf+RdBmnRK9 =Ed4D -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.1.2'
Tag 'libreoffice-3.6.1.2' created by Petr Mladek pmla...@suse.cz at 2012-08-21 15:44 -0700 Tag libreoffice-3.6.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQM57eAAoJEPQ0oe+v7q6jYUwQAMVGY8UNNiaxEmgFU11dWRzo TxyJe3WmeqCpXbJigJGQrMCFjIcLpZQAWSp8taw9+v+FoaRsmvrDtdgMLfdqgoWm LAgUWEj1lVonrgnpsuYYXW2LfeXB4Z3q8J+PviFdiCPyx8mlzNVUw4UEYJmQ2S0R 4jejmRAh1300KQntTWV0gBajCmIJtGrO5FiEEYGvMYhFZfrJUFnmIc7BiNvEqBqX 0GJRZTuP2kbSPLLd4yK3Fc4QWeQw7bhdIV+Mb2xvqExlilXozXonO9w8ZM84l99X bKFtzGtji6rIRGhgLMnB3ONGxmEXNdJknV1Wvq/VsG3jq0wxszMPyRtV8kTQgWwm 7LB6jg1uvFn9e5N8LSz7BjpMGveQlMgkS+R+BBPUxEHmRZjdPV5b4O16xK51NRMp vM3jxRgY2Cyb2YIoVmph7fy13Fmu2gptyXqGRznAFj84N6Khvc5CRtKlErKIGQ24 qSTb/ADqOPFyBO/ODADqZY6pPsmXcvuciJdhkYD9D431rWVGG8ipX/qDEQ8eUTJA 2H7smhAbKlvOzvqkGs20s5z6e0yvVeQftARpxzFkdfYG8sOmEK5kRcjNlODixtEY R3+7KXDywcmRRHc2cpv+JrUJVDL7dXhVBFjyiLAUurMF3szJbpPCu83jy9X6OBMU wt5BLfnE0yPuKLhNIuSY =miDE -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-29: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.1.2'
Tag 'libreoffice-3.6.1.2' created by Petr Mladek pmla...@suse.cz at 2012-08-21 15:44 -0700 Tag libreoffice-3.6.1.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQM57eAAoJEPQ0oe+v7q6jI3AQALpArt/FFXqIhrU7i4qx5P75 OPShivPVMHYc8dd9G+tbwOiJQpJIi5gBMrxWRUYaM8i02onziLJ9+6vjtCgn/0tC MRouRTHQhfu0TVduIZdtFugVl3eWuI9Wpj2ZGeIGztRh3jmCP7TF+fRCf9j3UOKe zFJiHQQp+pulmZF5m+kkkXJXNJPIKXI4WlXkXkkZqf0i5H7eh1Rw2T1bjyH7NLiw L671o9En43u+0dPRyBE44zJFtDX2swUZWyi6EnP4uyYl8t8TX5yNlb1iY4cuPe4y XTWaddmaAIytg+0LW8oVDp6ifvshCmcFNUTCl7kvBka0jOqDiwqw5X1jiSlRTiui 2u600HxfpJ97K4aDiJcyzHWu6H9NdJx4G/sc2pz6/Gok/l3gpCjaV4e9wwa19NXA tb9OSS08s6SYw7ukQ5DnFyPefRMepn1OSb/F8Rn0epizIjcKzsQMxrHtAdNh7Ll5 9/4kWHvA5CKFnH+AfZWS3reQKru6GLdox4ryPXLweuOlipSYzfGI5u5zOIWRtsmL A1bLknOaePlRQi8S6DEz8+i7FuA2Yslc7YuJ6Scz1luthktRkHfBLZWNgqVETWYb OnjWDlP9FFHRxCviDaXEaqu3KLNupabrqcZyLCbAn7sDRLEaFlDukcf80p5wtVBj VE+blxQIRdE+I0BSBWWy =Hds+ -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #358 from fr...@frankmayer.net 2012-08-21 15:41:00 UTC --- I'd like to nominate a href=https://bugs.freedesktop.org/show_bug.cgi?id=48828;Bug 48828/a as it actually corrupts document content. This was still an issue with 3.5.5 and is also an issue with 3.6.0 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 65 ++-
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 18
writerfilter/source/dmapper/DomainMapperTableManager.hxx |2
writerfilter/source/dmapper/TablePositionHandler.cxx | 61 ++
writerfilter/source/dmapper/TablePositionHandler.hxx | 42 +
writerfilter/source/ooxml/model.xml |3
7 files changed, 191 insertions(+), 1 deletion(-)
New commits:
commit edc4861a68e0269b83b17e0ec57912a1ce4220ad
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 15 16:31:51 2012 +0200
n#775899 initial docx import of w:vertAnchor inside w:tblpPr
Change-Id: I5c848a8d4c860a83d6729b8db40f744afad906d5
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index f768dce..3c30b36 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -122,6 +122,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/SettingsTable \
writerfilter/source/dmapper/StyleSheetTable \
writerfilter/source/dmapper/TDefTableHandler \
+writerfilter/source/dmapper/TablePositionHandler \
writerfilter/source/dmapper/TablePropertiesHandler \
writerfilter/source/dmapper/TblStylePrHandler \
writerfilter/source/dmapper/ThemeTable \
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 7fcd9e3..e0d8316 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -23,6 +23,7 @@
#include com/sun/star/table/TableBorder.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/text/HoriOrientation.hpp
+#include com/sun/star/text/RelOrientation.hpp
#include dmapperLoggers.hxx
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
@@ -691,11 +692,24 @@ void DomainMapperTableHandler::endTable()
if (m_pTableSeq-getLength() 0)
{
+uno::Referencetext::XTextRange xStart;
+uno::Referencetext::XTextRange xEnd;
+// If we want to make this table a floating one.
+bool bFloating =
!m_rDMapper_Impl.getTableManager().getTableVertAnchor().isEmpty();
+// Additional checks: if we can do this.
+if (bFloating (*m_pTableSeq)[0].getLength() 0
(*m_pTableSeq)[0][0].getLength() 0)
+{
+xStart = (*m_pTableSeq)[0][0][0];
+uno::Sequence uno::Sequence uno::Referencetext::XTextRange
rLastRow = (*m_pTableSeq)[m_pTableSeq-getLength() - 1];
+uno::Sequence uno::Referencetext::XTextRange rLastCell =
rLastRow[rLastRow.getLength() - 1];
+xEnd = rLastCell[1];
+}
+uno::Referencetext::XTextTable xTable;
try
{
if (m_xText.is())
{
-uno::Referencetext::XTextTable xTable =
m_xText-convertToTable(*m_pTableSeq,
+xTable = m_xText-convertToTable(*m_pTableSeq,
aCellProperties,
aRowProperties,
aTableInfo.aTableProperties);
@@ -723,6 +737,55 @@ void DomainMapperTableHandler::endTable()
(void) e;
#endif
}
+
+// If we have a table with a start and an end position, we should make
it a floating one.
+if (xTable.is() xStart.is() xEnd.is())
+{
+uno::Referencebeans::XPropertySet xTableProperties(xTable,
uno::UNO_QUERY);
+uno::Sequence beans::PropertyValue aFrameProperties(16);
+beans::PropertyValue* pFrameProperties =
aFrameProperties.getArray();
+pFrameProperties[0].Name = Width;
+pFrameProperties[0].Value =
xTableProperties-getPropertyValue(Width);
+
+pFrameProperties[1].Name = LeftBorderDistance;
+pFrameProperties[1].Value = sal_Int32(0);
+pFrameProperties[2].Name = RightBorderDistance;
+pFrameProperties[2].Value = sal_Int32(0);
+pFrameProperties[3].Name = TopBorderDistance;
+pFrameProperties[3].Value = sal_Int32(0);
+pFrameProperties[4].Name = BottomBorderDistance;
+pFrameProperties[4].Value = sal_Int32(0);
+
+pFrameProperties[5].Name = LeftMargin;
+pFrameProperties[5].Value = sal_Int32(0);
+pFrameProperties[6].Name = RightMargin;
+pFrameProperties[6].Value = sal_Int32(0);
+pFrameProperties[7].Name = TopMargin;
+pFrameProperties[7].Value = sal_Int32(0);
+pFrameProperties[8].Name = BottomMargin;
+pFrameProperties[8].Value = sal_Int32(0);
+
+table::BorderLine2 aEmptyBorder;
+pFrameProperties[9].Name = TopBorder;
+pFrameProperties[9].Value = aEmptyBorder;
+
Re: [GSOC] Calc Performance Project End
Hi Daniel, On Mon, 2012-08-20 at 20:52 -0500, Daniel Bankston wrote: I have had a great summer working on LibreOffice. I was lucky to have two of the best mentors anyone could hope for: Kohei Yoshida and Markus Mohrhard. I agree - they're both super-stars :-) Once again, thank you so much for allowing me to work with you on LibreOffice as a part of this year's GSOC, and thank you all for your continued hard work on all aspects of LibreOffice. Thanks for applying, and working dilligently; hopefully you can spread the news about how cool it is to hack on LibreOffice for GSOC and we'll have you your friends back again next year ? :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC-UPDATE](20.08) Impress Remote -- first testing apk.
On Tue, Aug 21, 2012 at 11:50 AM, Michael Meeks michael.me...@suse.com wrote: So we should help out with that; can you send an ssh key to Thorsten, and he can get you setup with an account on dev-builds.libreoffice.org - which is probably the right place to put this stuff. Thank you very much. I just send an email and ssh pub key to Thorsten. It's some great work generating it [ many thanks for that ]. Well it's actually really easy to do (even a non-dev like me can do it); it just takes hours (literally) of waiting for it to complete. But it's nice to know it's appreciated; I personally got the impression that the devs already have more work to do than they have time for. And certainly not the extra time to examine static analyzer reports to determine if they are actual bugs or just false positives. I guess I was wrong. :) Regards, John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unotext.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fd99896fcd4826e5326fe01dd28f168cf1844fd4
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Aug 21 17:58:24 2012 +0200
n#775899 SwXText::convertToTextFrame fix for multi-paragraph tables
The problem was that when we only had a table inside the frame, the
DelFullPara() call removed the last paragraph of the first cell, and
returned no error. Instead, check if we had to remove paragraphs both
before and after, and if so, use the manual remove all the time.
Change-Id: I9a3591ce9a92a2aca7d2f65b62fdf641f54e4f05
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index a8b91c8..8872b00 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1755,7 +1755,9 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
if (bParaAfterInserted)
{
xFrameTextCursor-gotoEnd(sal_False);
-if (!m_pImpl-m_pDoc-DelFullPara(*pFrameCursor-GetPaM()))
+if (!bParaBeforeInserted)
+m_pImpl-m_pDoc-DelFullPara(*pFrameCursor-GetPaM());
+else
{
// In case the frame has a table only, the cursor points to
the end of the first cell of the table.
SwPaM
aPaM(*pFrameCursor-GetPaM()-GetNode()-FindSttNodeByType(SwFlyStartNode)-EndOfSectionNode());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
master regression: PPT load ...
I have a slide test-case here: http://users.freedesktop.org/~michael/test-docs/Balmer.ppt It has a number of images, and bullets (and marketing nonsense) in it. It loads and renders fine in 3.6.0 - but in master the majority of the text and images are lost. Thoughts ? :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: IP change done
Hi, Lionel Elie Mamane wrote on 2012-08-21 14:43: I dunno if it is related, but connecting to gerrit.libreoffice.org timeouts over IPv6: thanks for the note - we don't have IPv6 available yet for the migrated machines, still something we need to work on (briding due to mac filtering) at our ISP. As IPv6 is usually the default (first try) for people that have IPv6 access, this looks like the website does not work, unless they have a lot of patience. Maybe someone forgot to edit the (IPv6) entries for the gerrit.libreoffice.org domain? I just removed the entry, should be propagated no later than 24 hours. Thanks for the note! Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx | 27 +--
1 file changed, 17 insertions(+), 10 deletions(-)
New commits:
commit a8cdce148c76c93c5d41820610d6e6ac175e03a7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 21 18:06:16 2012 +0200
fdo#53655: Ignore failure to remove directories (as happens on Windows XP)
...plus, add error codes to other failure's exception strings, just in
case...
Change-Id: Ic21c52e0ab52ed1752745e86bde214aee7c3c208
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 87c34e8..5409d56 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -170,32 +170,39 @@ void removeTree(OUString const url) {
}
if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
-cannot iterate directory + url,
+(cannot iterate directory + url + :
+ + OUString::valueOf(static_cast sal_Int32 (rc))),
css::uno::Reference css::uno::XInterface ());
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
-if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+rc = i.getFileStatus(stat);
+if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
-cannot stat in directory + url,
+(cannot stat in directory + url + :
+ + OUString::valueOf(static_cast sal_Int32 (rc))),
css::uno::Reference css::uno::XInterface ());
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO:
symlinks
removeTree(stat.getFileURL());
} else {
-if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None)
{
+rc = osl::File::remove(stat.getFileURL());
+if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
-cannot remove file + stat.getFileURL(),
+(cannot remove file + stat.getFileURL() + :
+ + OUString::valueOf(static_cast sal_Int32 (rc))),
css::uno::Reference css::uno::XInterface ());
}
}
}
-if (osl::Directory::remove(url) != osl::FileBase::E_None) {
-throw css::uno::RuntimeException(
-cannot remove directory + url,
-css::uno::Reference css::uno::XInterface ());
-}
+osl::FileBase::RC rc = osl::Directory::remove(url);
+SAL_WARN_IF(
+rc != osl::FileBase::E_None, desktop,
+cannot remove directory url : +rc);
+// at least on Windows XP removing some existing directories fails with
+// osl::FileBase::E_ACCESS because they are read-only; but keeping
those
+// directories around should be harmless once they are empty
}
// Remove any existing UserInstallation's user/extensions/bundled cache
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gerrit maildrop troubles [SOLVED]
Hi, while fixing another bug I realized that Norbert brutally ripped out the cronjob that synced the repo the maildrop used as a base. I now fixed that in making the maildrop use the gerrit repo (via local ssh) as the base -- that works, but is wasting ressources of course. In the long run, we either need the gerritbot to keep its up-to-date repo mirror again, or even better: let it read the git repo, which is on the same machine after all. Best, Bjoern Note: I also reenabled the sync for dev-tools, for which fdo is still the reference. We should soonish move the other repos over to gerrit too: Haveing some here, some there is just causing confusion, esp. since whatever you push to gerrit dev-tools master now will be forcefully overwritten by the sync. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6][REVIEW 3-6-1] fdo#53655: removing extensions\bundled fails on Win XP
One more from the oh no, not one more department: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to remove directories (as happens on Windows XP) fixes https://bugs.freedesktop.org/show_bug.cgi?id=53655 Install 3.6.1 RC 1 on 3.6.0 RC4, causes crash on startup where, exclusively on Windows XP it appears, removing (empty) directories in %appdata%\LibreOffice\3\user\extensions\bundled fails with E_ACCESS. Please, one more time, review for backporting to libreoffice-3-6 and libreoffice-3-6-1. Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - cppunit/ios.patch cppunit/makefile.mk ios/qa
cppunit/ios.patch | 43 +++
cppunit/makefile.mk |4
ios/qa/sc/Makefile |2 +-
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit df812bf9d5dc13788ec43710df9d0c052c418f11
Author: Tor Lillqvist t...@iki.fi
Date: Tue Aug 21 19:14:25 2012 +0300
Resurrect cppunit/ios.patch
Change-Id: Ie39f608d807ffd8cfb670e69a165cf4dd1e50d49
diff --git a/cppunit/ios.patch b/cppunit/ios.patch
new file mode 100644
index 000..2a0cba1
--- /dev/null
+++ b/cppunit/ios.patch
@@ -0,0 +1,43 @@
+--- misc/build/cppunit-1.13.0/configure
misc/build/cppunit-1.13.0/configure
+@@ -23273,7 +23273,7 @@
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: creating
$ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP
defines 5
+ $as_echo creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for
$ac_prefix_conf_INP defines 6; }
+ if test -f $ac_prefix_conf_INP ; then
+-$as_dirname -- /* automatically generated */ ||
++$as_dirname -- '/* automatically generated */' ||
+ $as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+X/* automatically generated */ : 'X\(//\)[^/]' \| \
+X/* automatically generated */ : 'X\(//\)$' \| \
+@@ -23318,5 +23318,5 @@
+ else
+ as_fn_error $? input file $ac_prefix_conf_IN does not exist, skip
generating $ac_prefix_conf_OUT $LINENO 5
+ fi
+- rm -f conftest.*
++ rm -f -r conftest.*
+ fi
+--- misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
+@@ -106,7 +106,9 @@
+ * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
+ * \endcode
+ */
++#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
+ #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
++#endif
+
+ /*! \brief Type of the function exported by a plug-in.
+ * \ingroup WritingTestPlugIn
+@@ -143,6 +143,12 @@
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+ typedef char __CppUnitPlugInImplementMainDummyTypeDef
+
++// Actually this is for iOS where we build the cppunit tests libraries
++// as plain archives and just link them statically into test fixture programs,
++// and don't want any stinking duplicate main(), but shouldn't hurt for
MacOSX either.
++#elif defined(__APPLE__)
++#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
++ typedef char __CppUnitPlugInImplementMainDummyTypeDef
+ // Unix
+ #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) ||
defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 03927e6..9536759 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -38,6 +38,10 @@ PATCH_FILES = windows.patch unix.patch
PATCH_FILES += android.patch
.ENDIF
+.IF $(OS) == IOS
+PATCH_FILES += ios.patch
+.ENDIF
+
.IF $(OS) == WNT
.IF $(COM) == MSC
commit 2d59d6904c2c73d5645aa0861223f399ce077781
Author: Tor Lillqvist t...@iki.fi
Date: Tue Aug 21 19:13:53 2012 +0300
Link with liblcms2
Change-Id: I8346d0d0b1543d45e45a24ae6ab76e856b26a1ba
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 76d5450..4308132 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC)
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno
lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector
lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo
-lavmedialo -lbasegfxlo -lcanvastoolslo -lcollator_data -lcomphelpgcc3
-lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo
-leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo
-lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18nutilgcc3 -licudata
-licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en
-llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo
-lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo
-lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict
-ltklo -ltllo -lucb1 -l
ucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal
-luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader
-lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv
-lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno
lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno
lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector
lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo
-lavmedialo -lbasegfxlo -lcanvastoolslo
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source
desktop/source/app/app.cxx | 27 +--
1 file changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 471b121a585dfdf6c6040084ec108100ef89de77
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 21 18:06:16 2012 +0200
fdo#53655: Ignore failure to remove directories (as happens on Windows XP)
...plus, add error codes to other failure's exception strings, just in
case...
Change-Id: Ic21c52e0ab52ed1752745e86bde214aee7c3c208
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4611ef3..d929787 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -165,32 +165,39 @@ void removeTree(OUString const url) {
}
if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
-cannot iterate directory + url,
+(cannot iterate directory + url + :
+ + OUString::valueOf(static_cast sal_Int32 (rc))),
css::uno::Reference css::uno::XInterface ());
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
-if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+rc = i.getFileStatus(stat);
+if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
-cannot stat in directory + url,
+(cannot stat in directory + url + :
+ + OUString::valueOf(static_cast sal_Int32 (rc))),
css::uno::Reference css::uno::XInterface ());
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO:
symlinks
removeTree(stat.getFileURL());
} else {
-if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None)
{
+rc = osl::File::remove(stat.getFileURL());
+if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
-cannot remove file + stat.getFileURL(),
+(cannot remove file + stat.getFileURL() + :
+ + OUString::valueOf(static_cast sal_Int32 (rc))),
css::uno::Reference css::uno::XInterface ());
}
}
}
-if (osl::Directory::remove(url) != osl::FileBase::E_None) {
-throw css::uno::RuntimeException(
-cannot remove directory + url,
-css::uno::Reference css::uno::XInterface ());
-}
+osl::FileBase::RC rc = osl::Directory::remove(url);
+SAL_WARN_IF(
+rc != osl::FileBase::E_None, desktop,
+cannot remove directory url : +rc);
+// at least on Windows XP removing some existing directories fails with
+// osl::FileBase::E_ACCESS because they are read-only; but keeping
those
+// directories around should be harmless once they are empty
}
// Remove any existing UserInstallation's user/extensions/bundled cache
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED-3-6] [REVIEW 3-6-1] fdo#53655: removing extensions\bundled fails on Win XP
On Tue, 2012-08-21 at 18:14 +0200, Stephan Bergmann wrote: One more from the oh no, not one more department: ;-) http://cgit.freedesktop.org/libreoffice/core/commit/?id=a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to remove directories (as happens on Windows XP) fixes https://bugs.freedesktop.org/show_bug.cgi?id=53655 Install 3.6.1 RC 1 on 3.6.0 RC4, causes crash on startup where, exclusively on Windows XP it appears, removing (empty) directories in %appdata%\LibreOffice\3\user\extensions\bundled fails with E_ACCESS. Seems v. sensible to me; much preferred to a crash-on-start under WinXP ;-) Pushed to -3-6-1. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master regression: PPT load ...
On Tue, 2012-08-21 at 18:17 +0200, Tomaž Vajngerl wrote: I'm on 03d64b736ac612f7ce2e7c40a0be04a6e23ae489 from 18.8. and ppt looks the same as in 3.6. Good :-) hopefully it's another user-error; I'm a few dozen commits further forward, on Linux, x86 at f4d996ceaa4d12 and I have a from-clean build as of today - which is a tad concerning. It'd be nice it someone else was not suffering the same problem :-) Thanks ! Michael. On Tue, Aug 21, 2012 at 6:02 PM, Michael Meeks michael.me...@suse.com wrote: I have a slide test-case here: http://users.freedesktop.org/~michael/test-docs/Balmer.ppt -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED-3-6] [REVIEW 3-6-1] fdo#53655: removing extensions\bundled fails on Win XP
On 21/08/12 18:24, Michael Meeks wrote: On Tue, 2012-08-21 at 18:14 +0200, Stephan Bergmann wrote: One more from the oh no, not one more department: ;-) http://cgit.freedesktop.org/libreoffice/core/commit/?id=a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to remove directories (as happens on Windows XP) fixes https://bugs.freedesktop.org/show_bug.cgi?id=53655 Install 3.6.1 RC 1 on 3.6.0 RC4, causes crash on startup where, exclusively on Windows XP it appears, removing (empty) directories in %appdata%\LibreOffice\3\user\extensions\bundled fails with E_ACCESS. Seems v. sensible to me; much preferred to a crash-on-start under WinXP ;-) Pushed to -3-6-1. oh no, +1 more from me :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] [PATCH] Object Catalog in Dialog Editor
the Layout class has some virtual methods with no implementation, this sounds like these need to be pure virtual making Layout an abstract class ( which makes sense ) When I looked a little close at some of those methods I notice IMO, not all empty virtual functions need to be pure virtual. Pure virtual functions are needed when the derived class really need to do something (e.g. returning a value). But GetState() is not that case. This function is virtual only to give the derived classes the possibility to modify the state of some buttons in the toolbar, but it isn't required (in other words, it's a listener function). And Layout was still abstract -- in the sense that it can only be instantiated by a derived class, because its ctor and dtor are protected. Layout::ConfigurationChanged is not used at all either in Layout itself of in any of the classed derived from it Yes, I forgot to remove that. A working ConfigurationChanged() is in ModulWindowLayout::SyntaxChanged. similarly ExcuteGlobal GetState I'd prefer if those were pure virtual, actually ExecuteGlobal isn't used in either class :-) so, it's not clear whether you actually intend to use them for something or not but it's confusing when you have like basides1.cxx:701 if (pLayout) pLayout-ExecuteGlobal(rReq); which does nothing It did something, but then I refactored ObjectCatalog to BasicIDEShell, and ExecuteGlobal became empty. But it may do something useful later, e.g. when we'll have buttons to toggle StackWindow and/or WatchWindow. virtual void UpdateDebug (bool bBasicStopped = false); virtuals with defaults are not really recommended, I removed the default, actually for this method, would be greate if we could remove it from this base class altogether, it doesn't really fit since Dialog has no concept of the debugger. The Layout class is a container and that method depends on assumptions about the contents of the container. Anyway I didn't see an easy way out of removing it at this point, probably something to keep in mind to try and remove from here in the future, it wont do any harm to leave it there. It's name is UpdateDebug() because it updates the StackWindow and WatchWindow -- both are needed to debug Basic. I'm not very good at inventing names. This function allowed to remove GetStackWindow() and GetWatchWindow(), which both violate encapsulation and disallow BasicIDEShell to handle layouts generally. It's better not to be pure virtual since only ModulWindowLayout does something useful -- all other classes (currently there is only one other class) just do nothing, so an empty body is suitable for default implementation. Uray M. János ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED-3-6] [REVIEW 3-6-1] fdo#53655: removing extensions\bundled fails on Win XP
Michael Meeks píše v Út 21. 08. 2012 v 17:24 +0100: On Tue, 2012-08-21 at 18:14 +0200, Stephan Bergmann wrote: One more from the oh no, not one more department: ;-) http://cgit.freedesktop.org/libreoffice/core/commit/?id=a8cdce148c76c93c5d41820610d6e6ac175e03a7 fdo#53655: Ignore failure to remove directories (as happens on Windows XP) fixes https://bugs.freedesktop.org/show_bug.cgi?id=53655 Install 3.6.1 RC 1 on 3.6.0 RC4, causes crash on startup where, exclusively on Windows XP it appears, removing (empty) directories in %appdata%\LibreOffice\3\user\extensions\bundled fails with E_ACCESS. Seems v. sensible to me; much preferred to a crash-on-start under WinXP ;-) Pushed to -3-6 +1 One more approval needed for 3-6-1. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master regression: PPT load ...
Michael Meeks-2 wrote I have a slide test-case here: http://users.freedesktop.org/~michael/test-docs/Balmer.ppt It has a number of images, and bullets (and marketing nonsense) in it. It loads and renders fine in 3.6.0 - but in master the majority of the text and images are lost. Hi. Checked with: LO 3.7.0.0.alpha0+ Build ID: a8647dd Windows XP Professional SP3 I can confirm. Checked few of my .ppt presentations and all have empty slides with template graphics only. Seems it is serious regression. All is good with LO 3.6.0.4 (Build ID: 932b512). Best regards. -- View this message in context: http://nabble.documentfoundation.org/master-regression-PPT-load-tp4002760p4002774.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Static src analysis of LibreOffice
All, Not a new report (yet), but the clang analyzer reports have found a permanent home at this location : http://dev-builds.libreoffice.org/clang_reports/ Regards, John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
