[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - 5 commits - sc/qa sc/source

[Daniel Bankston]

 sc/qa/unit/data/contentCSV/repeatedColumns.csv |1 
 sc/qa/unit/data/ods/repeatedColumns.ods|binary
 sc/qa/unit/subsequent_filters-test.cxx |   16 
 sc/source/filter/xml/xmlcelli.cxx  |   33 +++--
 sc/source/filter/xml/xmlcelli.hxx  |6 +---
 sc/source/filter/xml/xmlrowi.cxx   |4 +--
 6 files changed, 36 insertions(+), 24 deletions(-)

New commits:
commit 870bccb97838e175febf22b8103503097c59bf58
Author: Daniel Bankston 
Date:   Tue Jun 5 21:30:25 2012 -0500

Fix repeating columns

Change-Id: I35d8cc824bf7efceae6225432d5a261bd3883211

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 08868c3..9e309f7 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -822,14 +822,14 @@ void ScXMLTableRowCellContext::EndElement()
 
 for (SCCOL i = 0; i < nCellsRepeated; ++i)
 {
-aScCurrentPos.SetCol( aScCurrentPos.Col() + i );
+aScCurrentPos.SetCol( aScCellPos.Col() + i );
 if (i > 0)
 rTables.AddColumn(false);
 if (!bIsEmpty)
 {
 for (SCROW j = 0; j < nRepeatedRows; ++j)
 {
-aScCurrentPos.SetRow( aScCurrentPos.Row() + j );
+aScCurrentPos.SetRow( aScCellPos.Row() + j );
 if( (aScCurrentPos.Col() == 0) && (j > 0) )
 {
 rTables.AddRow();
commit 2d5b89ab94b5b960a14f4385b5631ad905c464a9
Author: Daniel Bankston 
Date:   Tue Jun 5 20:18:09 2012 -0500

Commit files used in repeated columns unit test

Change-Id: Ie8e9a3a3f36caa55f495ef7a6670b73ebe9e2086

diff --git a/sc/qa/unit/data/contentCSV/repeatedColumns.csv 
b/sc/qa/unit/data/contentCSV/repeatedColumns.csv
new file mode 100644
index 000..ffcf6c2
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/repeatedColumns.csv
@@ -0,0 +1 @@
+test,test,test,test,test,test
diff --git a/sc/qa/unit/data/ods/repeatedColumns.ods 
b/sc/qa/unit/data/ods/repeatedColumns.ods
new file mode 100644
index 000..f1e7b69
Binary files /dev/null and b/sc/qa/unit/data/ods/repeatedColumns.ods differ
commit 9e7989cc8009eb008a09d5e78a80855088b54b7c
Author: Daniel Bankston 
Date:   Tue Jun 5 20:16:00 2012 -0500

Added unit test for repeated columns in ODS import.

Change-Id: Idf3cf3a1f6fd1487c83470a9e5df4c940ee64c73

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index da349f7..cfe32e0 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -112,6 +112,7 @@ public:
 void testBugFixesXLS();
 void testBugFixesXLSX();
 void testBrokenQuotesCSV();
+void testRepeatedColumnsODS();
 
 //change this test file only in excel and not in calc
 void testSharedFormulaXLSX();
@@ -137,6 +138,7 @@ public:
 CPPUNIT_TEST(testBugFixesODS);
 CPPUNIT_TEST(testBugFixesXLS);
 CPPUNIT_TEST(testBugFixesXLSX);
+CPPUNIT_TEST(testRepeatedColumnsODS);
 #if 0
 CPPUNIT_TEST(testBrokenQuotesCSV);
 #endif
@@ -629,6 +631,20 @@ void ScFiltersTest::testBugFixesXLSX()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testRepeatedColumnsODS()
+{
+const rtl::OUString 
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns."));
+ScDocShellRef xDocSh = loadDoc( aFileNameBase, 0);
+
+ScDocument* pDoc = xDocSh->GetDocument();
+
+rtl::OUString aCSVFileName;
+
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("repeatedColumns.")), 
aCSVFileName);
+testFile(aCSVFileName, pDoc, 0);
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testBrokenQuotesCSV()
 {
 const rtl::OUString 
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("fdo48621_broken_quotes."));
commit adfc8c78a2514ab6f4ba8821cbdbb237014eab70
Author: Daniel Bankston 
Date:   Tue Jun 5 20:10:01 2012 -0500

Remove comments

Change-Id: I257a18325c3f385e14bed88aca6bdd2a8eba30b1

diff --git a/sc/source/filter/xml/xmlcelli.hxx 
b/sc/source/filter/xml/xmlcelli.hxx
index e8fecfd..3e624ee 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -60,10 +60,6 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
 ScMyImpDetectiveObjVec* pDetectiveObjVec;
 ScMyImpCellRangeSource* pCellRangeSource;
 double  fValue;
-//~ sal_Int32   nMergedRows, nMergedCols;
-//~ sal_Int32   nMatrixRows, nMatrixCols;
-//~ sal_Int32   nRepeatedRows;
-//~ sal_Int32   nCellsRepeated;
 SCROW   nMergedRows, nMatrixRows, nRepeatedRows;
 SCCOL   nMergedCols, nMatrixCols, nCellsRepeated;
 ScXMLImport& rXMLImport;
commit 891d6b636f9c7a2d41505b2729deb1135215598e
Author: Daniel Bankston 
Date:   Tue Jun 5 15:07:27 2012 -050

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/sdi sc/source

[Kohei Yoshida]

 sc/sdi/prevwsh.sdi|1 +
 sc/source/ui/view/prevwsh.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f81018e4d74188b969227fe3082c5a7ca88a3fe1
Author: Kohei Yoshida 
Date:   Wed Jun 6 02:08:40 2012 -0400

Disable Exit application (Ctrl-Q) from preview mode.

Again, to prevent a modified document from launching the "do you want
to save this doc?" dialog while in page preview mode.

Change-Id: I638ca308a14ad5941b9db164a0753e0aad8e7968

diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 5f1a1be..647860f 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -164,6 +164,7 @@ interface TablePrintPreview
 SID_SAVEASDOC   [ StateMethod = GetState; Export = FALSE; ]
 SID_MAIL_SENDDOC[ StateMethod = GetState; Export = FALSE; ]
 SID_VIEW_DATA_SOURCE_BROWSER [ StateMethod = GetState; Export = FALSE; ]
+SID_QUITAPP [ StateMethod = GetState; Export = FALSE; ]
 }
 
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 091baec..a69cb79 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -843,6 +843,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
 case SID_SAVEASDOC:
 case SID_MAIL_SENDDOC:
 case SID_VIEW_DATA_SOURCE_BROWSER:
+case SID_QUITAPP:
 rSet.DisableItem(nWhich);
 break;
 case SID_PREVIEW_PREVIOUS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/sdi sc/source

[Kohei Yoshida]

 sc/sdi/prevwsh.sdi|1 +
 sc/source/ui/view/prevwsh.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 20aad2af9b01df77ec5b01931da51523d08af69a
Author: Kohei Yoshida 
Date:   Wed Jun 6 02:08:40 2012 -0400

Disable Exit application (Ctrl-Q) from preview mode.

Again, to prevent a modified document from launching the "do you want
to save this doc?" dialog while in page preview mode.

Change-Id: I638ca308a14ad5941b9db164a0753e0aad8e7968

diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 5f1a1be..647860f 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -164,6 +164,7 @@ interface TablePrintPreview
 SID_SAVEASDOC   [ StateMethod = GetState; Export = FALSE; ]
 SID_MAIL_SENDDOC[ StateMethod = GetState; Export = FALSE; ]
 SID_VIEW_DATA_SOURCE_BROWSER [ StateMethod = GetState; Export = FALSE; ]
+SID_QUITAPP [ StateMethod = GetState; Export = FALSE; ]
 }
 
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 091baec..a69cb79 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -843,6 +843,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
 case SID_SAVEASDOC:
 case SID_MAIL_SENDDOC:
 case SID_VIEW_DATA_SOURCE_BROWSER:
+case SID_QUITAPP:
 rSet.DisableItem(nWhich);
 break;
 case SID_PREVIEW_PREVIOUS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Disabling file opening and saving in print preview mode

[Kohei Yoshida]

On 06/05/2012 11:22 AM, Kohei Yoshida wrote:


The reason for disabling the close commands
rather than intercepting them and translating them to just end the
preview mode is because it's technically very difficult to do so because
of the way we end the preview shell. I won't go into the detail here.


Actually I've figured out a way to do that.  Now when you select File - 
Close or Ctrl-W in the preview mode, it will end the preview and go back 
to the normal Calc window.


Kohei

--
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' - framework/inc framework/source

[Kohei Yoshida]

 framework/inc/dispatch/closedispatcher.hxx|4 
 framework/source/dispatch/closedispatcher.cxx |   23 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit ca182b4545239ccf5b0326674fd66891c1ed9f71
Author: Kohei Yoshida 
Date:   Wed Jun 6 01:28:55 2012 -0400

Check if the system window has a close handler, and if yes, call it.

This allows the close event in the preview window to be handled in a
custom fashion, instead of having it call the normal "close window"
command.

Change-Id: Id324c4f5c96d0222bf82caa8029aa1c724262c32

diff --git a/framework/inc/dispatch/closedispatcher.hxx 
b/framework/inc/dispatch/closedispatcher.hxx
index eabad8c..9ec937c 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -60,6 +60,8 @@
 //___
 // namespace
 
+class SystemWindow;
+
 namespace framework{
 
 //---
@@ -135,6 +137,8 @@ class CloseDispatcher : public css::lang::XTypeProvider
 /** @short  holded alive for internaly asynchronous operations! */
 css::uno::Reference< css::frame::XDispatchResultListener > 
m_xResultListener;
 
+SystemWindow* m_pSysWindow;
+
 //---
 // native interface
 
diff --git a/framework/source/dispatch/closedispatcher.cxx 
b/framework/source/dispatch/closedispatcher.cxx
index cf81fa5..4a54131 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -53,12 +53,15 @@
 
 #include 
 #include 
+#include "vcl/syswin.hxx"
 #include 
 #include 
 
 //___
 // namespace
 
+using namespace com::sun::star;
+
 namespace framework{
 
 #ifdef fpf
@@ -96,8 +99,19 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< 
css::lang::XMultiSer
 , m_xSMGR(xSMGR   )
 , m_aAsyncCallback   (LINK( this, CloseDispatcher, impl_asyncCallback))
 , m_lStatusListener  (m_aLock.getShareableOslMutex()  )
+, m_pSysWindow(NULL)
 {
-m_xCloseFrame = 
CloseDispatcher::static_impl_searchRightTargetFrame(xFrame, sTarget);
+uno::Reference xTarget = 
static_impl_searchRightTargetFrame(xFrame, sTarget);
+m_xCloseFrame = xTarget;
+
+// Try to retrieve the system window instance of the closing frame.
+uno::Reference xWindow = xTarget->getContainerWindow();
+if (xWindow.is())
+{
+Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+if (pWindow->IsSystemWindow())
+m_pSysWindow = dynamic_cast(pWindow);
+}
 }
 
 //---
@@ -211,6 +225,13 @@ void SAL_CALL 
CloseDispatcher::dispatchWithNotification(const css::util::URL&
 return;
 }
 
+if (m_pSysWindow && m_pSysWindow->GetCloseHdl().IsSet())
+{
+// The closing frame has its own close handler.  Call it instead.
+m_pSysWindow->GetCloseHdl().Call(m_pSysWindow);
+return;
+}
+
 // OK - URLs are the right ones.
 // But we cant execute synchronously :-)
 // May we are called from a generic key-input handler,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/inc framework/source

[Kohei Yoshida]

 framework/inc/dispatch/closedispatcher.hxx|4 
 framework/source/dispatch/closedispatcher.cxx |   23 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit d0c3c24da2506bff1719a276f2eff34589fa7663
Author: Kohei Yoshida 
Date:   Wed Jun 6 01:28:55 2012 -0400

Check if the system window has a close handler, and if yes, call it.

This allows the close event in the preview window to be handled in a
custom fashion, instead of having it call the normal "close window"
command.

Change-Id: Id324c4f5c96d0222bf82caa8029aa1c724262c32

diff --git a/framework/inc/dispatch/closedispatcher.hxx 
b/framework/inc/dispatch/closedispatcher.hxx
index eabad8c..9ec937c 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -60,6 +60,8 @@
 //___
 // namespace
 
+class SystemWindow;
+
 namespace framework{
 
 //---
@@ -135,6 +137,8 @@ class CloseDispatcher : public css::lang::XTypeProvider
 /** @short  holded alive for internaly asynchronous operations! */
 css::uno::Reference< css::frame::XDispatchResultListener > 
m_xResultListener;
 
+SystemWindow* m_pSysWindow;
+
 //---
 // native interface
 
diff --git a/framework/source/dispatch/closedispatcher.cxx 
b/framework/source/dispatch/closedispatcher.cxx
index cf81fa5..4a54131 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -53,12 +53,15 @@
 
 #include 
 #include 
+#include "vcl/syswin.hxx"
 #include 
 #include 
 
 //___
 // namespace
 
+using namespace com::sun::star;
+
 namespace framework{
 
 #ifdef fpf
@@ -96,8 +99,19 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< 
css::lang::XMultiSer
 , m_xSMGR(xSMGR   )
 , m_aAsyncCallback   (LINK( this, CloseDispatcher, impl_asyncCallback))
 , m_lStatusListener  (m_aLock.getShareableOslMutex()  )
+, m_pSysWindow(NULL)
 {
-m_xCloseFrame = 
CloseDispatcher::static_impl_searchRightTargetFrame(xFrame, sTarget);
+uno::Reference xTarget = 
static_impl_searchRightTargetFrame(xFrame, sTarget);
+m_xCloseFrame = xTarget;
+
+// Try to retrieve the system window instance of the closing frame.
+uno::Reference xWindow = xTarget->getContainerWindow();
+if (xWindow.is())
+{
+Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+if (pWindow->IsSystemWindow())
+m_pSysWindow = dynamic_cast(pWindow);
+}
 }
 
 //---
@@ -211,6 +225,13 @@ void SAL_CALL 
CloseDispatcher::dispatchWithNotification(const css::util::URL&
 return;
 }
 
+if (m_pSysWindow && m_pSysWindow->GetCloseHdl().IsSet())
+{
+// The closing frame has its own close handler.  Call it instead.
+m_pSysWindow->GetCloseHdl().Call(m_pSysWindow);
+return;
+}
+
 // OK - URLs are the right ones.
 // But we cant execute synchronously :-)
 // May we are called from a generic key-input handler,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Bugzilla Version Picker items – 2

[Rainer Bielefeld]

June 6, 2012

Hello,

We branched 3.6 and have a new Master, I have to hurry up a little with 
my action to revise the Bugzilla version picker contents due to 
. Please 
excuse me for being late with this.


First Steps

I just created a new Version 3.7.0alpha0+ Master, and since the fix for 
"Bug 49622 – Increase column width for Version in query results "The 
version now will be shown correctly in queries.


I created Bug 50755, please add comments there quickly if you see that 
new Versions in Picker cause trouble


Further Proceeding

I will prepare a mass change of all Versions today, don’t worry, there 
will be no mass e-mails for the bugs.


When I will start with the modifications, Function of the "Bug 
submission Assistant" will be partially broken for a while. I will 
contact Thorsten Behrens to find a solution to modify Assistant ASAP.


I am planning to do most modifications today (2012-06-06) in the afternoon.

Possible Problems

There might (will!) be some Problems:

 1.   Bug Submission Assistant will be broken temporarily
 2.   External queries with Version relation will not work any longer
  and will have to be modified. Most saved queries should be
  adapted automatically, but I did not test that. Version entries
  in field "Custom search" will have to be adapted manually."
 3.   We will see what happens when someone reports a bug just when I
  am modifying a Version

Comments, hints, discussion please in


Best regards

Rainer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - README.Solaris sal/inc

[David Tardon]

 README.Solaris |   39 +++
 sal/inc/sal/mathconf.h |3 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit f209a7562e85c6d5dd491c8999e8fc61da18a965
Author: Lionel Dricot 
Date:   Mon Jun 4 22:02:47 2012 +0200

std::isfinite seems to not be available under Solaris. Bypassing it.

Change-Id: I8f6f844338cb188a63676f2db5dec89fccfdca4c

diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 1e4b11b..35d7bff 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -63,7 +63,8 @@ extern "C" {
 
 
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined(__cplusplus) && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || 
__cplusplus >= 201103L )
+#if !defined SOLARIS && defined(__cplusplus) \
+ && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus 
>= 201103L )
 #define SAL_MATH_FINITE(d) std::isfinite(d)
 #elif defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
commit f76a25c45b247fbdd77c47e033286e3adc5d553a
Author: Lionel Dricot 
Date:   Mon Jun 4 17:03:10 2012 +0200

Introducing a README to compile LO on Solaris with GCC

Change-Id: Ibd9075708fb5b47fb3ed1bf438522c3f3f2af0ab

diff --git a/README.Solaris b/README.Solaris
new file mode 100644
index 000..a36cc8b
--- /dev/null
+++ b/README.Solaris
@@ -0,0 +1,39 @@
+Instructions to compile LO on Solaris with gcc
+
+Disclaimer
+--
+This is still work in progress
+Compiling LO on Solaris with gcc is a work done by Lanedo ( www.lanedo.com )
+Any inquiry could be sent to office-sola...@lanedo.com
+
+
+Prerequisites
+-
+
+A working Oracle Solaris 11 installation
+
+
+Installing Dependancies
+---
+
+sudo -s
+
+pkg install git make gcc-45 autoconf autogen automake-110 gnu-m4
+
+perl -MCPAN -e 'install Archive::Zip::Archive'
+
+pkg install pkg:/system/header@0.5.11-0.175.0.0.0.2.1
+pkg install pkg:/developer/gperf@3.0.3-0.175.0.0.0.2.537
+pkg install pkg:/developer/parser/bison@2.3-0.175.0.0.0.2.537
+pkg install pkg:/developer/lexer/flex@2.5.35-0.175.0.0.0.2.537
+pkg install pkg:/developer/documentation-tool/doxygen@1.5.7.1-0.175.0.0.0.2.537
+
+
+Compiling
+-
+
+CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 
--without-junit --disable-mozilla --with-system-curl --without-help 
--disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf 
--enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts 
--with-system-dicts --without-stlport --disable-mozilla 
--without-system-mozilla --disable-xmlsec --with-system-openssl
+
+gmake
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] [REVIEW:3-5] fdo#47473 legacy reports created in 3.5 fail to open

[Lionel Elie Mamane]

On Wed, Jun 06, 2012 at 06:11:31AM +0200, Lionel Elie Mamane wrote:
> On Tue, Jun 05, 2012 at 10:11:23PM +0200, Lionel Elie Mamane wrote:

>> Legacy reports (not Sun/Oracle Report Builder ones) created by the
>> wizard in LibreOffice 3.5 or later fail to open (in LibreOffice 3.5
>> and later): show empty data.

>> Please apply to libreoffice-3-5 branch.

> Wait... I causes a build failure on MOX.

Here's the fix by Norbert. Please apply both the original patch and
the fix. Thanks. (And somebody find me a brown paper bag...)

-- 
Lionel
>From f6bc6c351144ae10c29d4747a4c40f80554f272f Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud 
Date: Tue, 5 Jun 2012 18:14:52 -0500
Subject: [PATCH] fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79

Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150
---
 .../wizards/report/ReportTextImplementation.java   |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 94b4e40..6be5b36 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -291,6 +291,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 bexecute = getRecordParser().executeCommand(nCommandType); //sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, true);
 if (bexecute)
 {
+DBMetaData.CommandObject oCommand = getRecordParser().getQueryByName(sQueryName);
 bexecute = getRecordParser().getFields(sFieldNameList, true);
 if (bexecute && getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
 {
-- 
1.7.7.3

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] Changes to 'features/base-preview'

[Lionel Elie Mamane]

New branch 'features/base-preview' available with the following commits:
commit ebe883d597c56d4ada66e471a21c9bcda10d06a7
Author: Norbert Thiebaud 
Date:   Tue Jun 5 18:14:52 2012 -0500

fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79

Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150

commit caab5e8a4762bcded8f16c70eec532b0dc2435c4
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:30:40 2012 +0200

fdo#47473 try to set new order only after field columns are available

Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d

commit eece16361dd419656f92344e91a883e63e94dc0e
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

 - Data must be fetched in increasing order of column number
   (again, this is about SQLGetData).

   This is a harder issue. The current solution has the nice advantage
   of completely isolating the rest of LibO from these restrictions.

   I don't currently see how to cleanly avoid (potentially
   unnecessarily) caching column 4 if we are asked for column 3 then
   column 5, just in case we are asked for column 4 later on, unless
   we issue a specific "SELECT column4" later. But the latter would be
   quite expensive in terms of app-to-database roudtripe times :-( and
   thus creates another performance issue.

Change-Id: I999b3f8f0b8a215acb390ffefc839235346e8353

commit bf40495c23af4696d68e0ac0e63fce7fff3c32cc
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:41:33 2012 +0200

Need to refresh row after moving to bookmark!

Change-Id: Ia8d12d02829087309e248506a7d3b0f94b5a425e

commit e245ea6b82373706b2221f854326d593b4c2fb88
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:40:30 2012 +0200

Cleanup m_xSet in destructor

Change-Id: I3d7023fcb1857da1ef107a8af0d373b9ca464f03

commit 0fb5b4fbfd291bb4806a1b482448edadd8459794
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:35:52 2012 +0200

typos in comments

Change-Id: I1dbb1990033602d7909ecdee72b8b699cce44cab

commit 0625ef9431e4400c3d52d9f06ebe8550b0d4248a
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:31:25 2012 +0200

Rem

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

[Lionel Elie Mamane]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANN] Referencing bugs in commits

[Markus Mohrhard]

Hello Lionel,

2012/6/5 Lionel Elie Mamane :
> On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:
>
>> Markus has implemented a nice feature that should help keeping the bugs
>> up to date: whenever you are committing / pushing to git, and you
>> reference the bugs.freedesktop.org bug in the commit message, it will
>> automatically appear as a comment in the bug :-)
>
> It now sets weird targets for commits to libreoffice-3-6:
>
>  target:3.6.3.6Beta1 in fdo#47473
>  3.6Beta1 in fdo#47325
>
> (the last is without target, was manually corrected by human later)
>
> From what I remember from the documentation of target: on the wiki, it
> should not have "beta", so that queries stay sane, only 3.6.0. OTOH, I
> very much agree that the info of in which beta/rc it is supposed to be
> fixed is *very* useful for checking that the bug is really fixed!
>

This was the result of a discussion between Kendy and me. During the
beta phase it is not helpful to add 3.6.0 to the whiteboard line
because it covers in this time nearly 6 weeks. Setting the right
version as target may help users to test this as early as possible.

I hope I fixed this problem now.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] [REVIEW:3-5] fdo#47473 legacy reports created in 3.5 fail to open

[Lionel Elie Mamane]

On Tue, Jun 05, 2012 at 10:11:23PM +0200, Lionel Elie Mamane wrote:
> Legacy reports (not Sun/Oracle Report Builder ones) created by the
> wizard in LibreOffice 3.5 or later fail to open (in LibreOffice 3.5
> and later): show empty data.

> Please apply to libreoffice-3-5 branch.

Wait... I causes a build failure on MOX.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/template-dialog' - 3 commits - sfx2/inc sfx2/source

[Rafael Dominguez]

 sfx2/inc/templatedlg.hxx|4 +
 sfx2/source/doc/templatedlg.cxx |  159 +++-
 sfx2/source/doc/templatedlg.hrc |2 
 sfx2/source/doc/templatedlg.src |   13 ++-
 4 files changed, 174 insertions(+), 4 deletions(-)

New commits:
commit f74a116fe3303c69cb8d6f886f3678f183e35f84
Author: Rafael Dominguez 
Date:   Tue Jun 5 22:13:31 2012 -0430

Display documents embedded thumbnails.

Change-Id: I0f56c6e564dbfcfc646717c562d61b8bd977edd1

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e6393dc..337061c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -9,17 +9,138 @@
 
 #include "templatedlg.hxx"
 
+#include 
 #include 
 #include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
 
 #include "orgmgr.hxx"
 
 #include "doc.hrc"
 #include "templatedlg.hrc"
 
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
 #define MAX_COLUMN_COUNT 4
 #define MAX_LINE_COUNT 2
 
+Image lcl_fetchThumbnail (const rtl::OUString &msURL)
+{
+
+// Load the thumbnail from a template document.
+uno::Reference xIStream;
+
+uno::Reference< lang::XMultiServiceFactory > xServiceManager (
+::comphelper::getProcessServiceFactory());
+if (xServiceManager.is())
+{
+try
+{
+uno::Reference xStorageFactory(
+xServiceManager->createInstance( 
"com.sun.star.embed.StorageFactory"),
+uno::UNO_QUERY);
+
+if (xStorageFactory.is())
+{
+uno::Sequence aArgs (2);
+aArgs[0] <<= msURL;
+aArgs[1] <<= embed::ElementModes::READ;
+uno::Reference xDocStorage (
+xStorageFactory->createInstanceWithArguments(aArgs),
+uno::UNO_QUERY);
+
+try
+{
+if (xDocStorage.is())
+{
+uno::Reference xStorage (
+xDocStorage->openStorageElement(
+"Thumbnails",
+embed::ElementModes::READ));
+if (xStorage.is())
+{
+uno::Reference xThumbnailCopy (
+xStorage->cloneStreamElement("thumbnail.png"));
+if (xThumbnailCopy.is())
+xIStream = xThumbnailCopy->getInputStream();
+}
+}
+}
+catch (const uno::Exception& rException)
+{
+OSL_TRACE (
+"caught exception while trying to access 
Thumbnail/thumbnail.png of %s: %s",
+::rtl::OUStringToOString(msURL,
+RTL_TEXTENCODING_UTF8).getStr(),
+::rtl::OUStringToOString(rException.Message,
+RTL_TEXTENCODING_UTF8).getStr());
+}
+
+try
+{
+// An (older) implementation had a bug - The storage
+// name was "Thumbnail" instead of "Thumbnails".  The
+// old name is still used as fallback but this code can
+// be removed soon.
+if ( ! xIStream.is())
+{
+uno::Reference xStorage (
+xDocStorage->openStorageElement( "Thumbnail",
+embed::ElementModes::READ));
+if (xStorage.is())
+{
+uno::Reference xThumbnailCopy (
+xStorage->cloneStreamElement("thumbnail.png"));
+if (xThumbnailCopy.is())
+xIStream = xThumbnailCopy->getInputStream();
+}
+}
+}
+catch (const uno::Exception& rException)
+{
+OSL_TRACE (
+"caught exception while trying to access 
Thumbnails/thumbnail.png of %s: %s",
+::rtl::OUStringToOString(msURL,
+RTL_TEXTENCODING_UTF8).getStr(),
+::rtl::OUStringToOString(rException.Message,
+RTL_TEXTENCODING_UTF8).getStr());
+}
+}
+}
+catch (const uno::Exception& rException)
+{
+OSL_TRACE (
+"caught exception while trying to access tuhmbnail of %s: %s",
+::rtl::OUStringToOString(msURL,
+RTL_TEXTENCODING_UTF8).getStr(),
+::rtl::OUStringToOString(rException.Message,
+RTL_TEXTENCODING_UTF8).getStr());
+}
+

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - lcms2/makefile.mk

[Norbert Thiebaud]

 lcms2/makefile.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9a2a5319b2ec8b816742b87fcf27bf73351fd01a
Author: Norbert Thiebaud 
Date:   Tue Jun 5 21:07:01 2012 -0500

play with the Layer thinggy for lcms2 to get the macosx build to finish

Change-Id: I9901d2ef270a096993630103b3cdb5b89e2bb829

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 50a42dd..6f619bf 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -72,6 +72,11 @@ CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" ./configure 
--without-jpeg --without-t
 CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+--prefix=/@.__$(EXTRPATH)
+.END
+
 .IF "$(OS)" == "IOS"
 CONFIGURE_ACTION += --disable-shared
 .ENDIF
@@ -83,7 +88,6 @@ BUILD_ACTION = $(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM)
 OUT2INC+=include$/lcms2*.h
 
 .IF "$(OS)"=="MACOSX"
-EXTRPATH=LOADER
 OUT2LIB+=src$/.libs$/liblcms2.*.dylib
 .ELIF "$(OS)"=="IOS"
 OUT2LIB+=src$/.libs$/liblcms2.a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lcms2/makefile.mk

[Norbert Thiebaud]

 lcms2/makefile.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 927c22241a5128cd58e996910e3b6e279bf76768
Author: Norbert Thiebaud 
Date:   Tue Jun 5 21:07:01 2012 -0500

play with the Layer thinggy for lcms2 to get the macosx build to finish

Change-Id: I9901d2ef270a096993630103b3cdb5b89e2bb829

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 50a42dd..6f619bf 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -72,6 +72,11 @@ CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" ./configure 
--without-jpeg --without-t
 CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+--prefix=/@.__$(EXTRPATH)
+.END
+
 .IF "$(OS)" == "IOS"
 CONFIGURE_ACTION += --disable-shared
 .ENDIF
@@ -83,7 +88,6 @@ BUILD_ACTION = $(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM)
 OUT2INC+=include$/lcms2*.h
 
 .IF "$(OS)"=="MACOSX"
-EXTRPATH=LOADER
 OUT2LIB+=src$/.libs$/liblcms2.*.dylib
 .ELIF "$(OS)"=="IOS"
 OUT2LIB+=src$/.libs$/liblcms2.a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/sdi sc/source

[Kohei Yoshida]

 sc/sdi/prevwsh.sdi|2 ++
 sc/source/ui/view/prevwsh.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit cb1a81d84de1a5927b66a7a59a3dff756991db50
Author: Kohei Yoshida 
Date:   Tue Jun 5 20:37:42 2012 -0400

Disable Data source (F4) icon in preview mode.

Change-Id: I4d3371a48ec943dcced295069564c9fcf6dffd92

diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 530dbc2..5f1a1be 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -163,6 +163,7 @@ interface TablePrintPreview
 SID_SAVEDOC [ StateMethod = GetState; Export = FALSE; ]
 SID_SAVEASDOC   [ StateMethod = GetState; Export = FALSE; ]
 SID_MAIL_SENDDOC[ StateMethod = GetState; Export = FALSE; ]
+SID_VIEW_DATA_SOURCE_BROWSER [ StateMethod = GetState; Export = FALSE; ]
 }
 
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ebc4e68..091baec 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -842,6 +842,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
 case SID_SAVEDOC:
 case SID_SAVEASDOC:
 case SID_MAIL_SENDDOC:
+case SID_VIEW_DATA_SOURCE_BROWSER:
 rSet.DisableItem(nWhich);
 break;
 case SID_PREVIEW_PREVIOUS:
commit c0ae42c94e103b5ac603519817c0072033f4cc05
Author: Kohei Yoshida 
Date:   Tue Jun 5 20:19:10 2012 -0400

Disable "send document as email" icon in preview mode.

Change-Id: I8e73e30354b08a140e2dfc4d4e4f54fb31a85c6b

diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 2117128..530dbc2 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -162,6 +162,7 @@ interface TablePrintPreview
 
 SID_SAVEDOC [ StateMethod = GetState; Export = FALSE; ]
 SID_SAVEASDOC   [ StateMethod = GetState; Export = FALSE; ]
+SID_MAIL_SENDDOC[ StateMethod = GetState; Export = FALSE; ]
 }
 
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 1e556f0..ebc4e68 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -841,6 +841,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
 case SID_REPEAT:
 case SID_SAVEDOC:
 case SID_SAVEASDOC:
+case SID_MAIL_SENDDOC:
 rSet.DisableItem(nWhich);
 break;
 case SID_PREVIEW_PREVIOUS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/sdi sc/source

[Kohei Yoshida]

 sc/sdi/prevwsh.sdi|2 ++
 sc/source/ui/view/prevwsh.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit e59987a91c0d486b9823a0d9249656856fd3fad5
Author: Kohei Yoshida 
Date:   Tue Jun 5 20:37:42 2012 -0400

Disable Data source (F4) icon in preview mode.

Change-Id: I4d3371a48ec943dcced295069564c9fcf6dffd92

diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 530dbc2..5f1a1be 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -163,6 +163,7 @@ interface TablePrintPreview
 SID_SAVEDOC [ StateMethod = GetState; Export = FALSE; ]
 SID_SAVEASDOC   [ StateMethod = GetState; Export = FALSE; ]
 SID_MAIL_SENDDOC[ StateMethod = GetState; Export = FALSE; ]
+SID_VIEW_DATA_SOURCE_BROWSER [ StateMethod = GetState; Export = FALSE; ]
 }
 
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ebc4e68..091baec 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -842,6 +842,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
 case SID_SAVEDOC:
 case SID_SAVEASDOC:
 case SID_MAIL_SENDDOC:
+case SID_VIEW_DATA_SOURCE_BROWSER:
 rSet.DisableItem(nWhich);
 break;
 case SID_PREVIEW_PREVIOUS:
commit 216a2a44518e9e76310d78ab22c4c035602d9533
Author: Kohei Yoshida 
Date:   Tue Jun 5 20:19:10 2012 -0400

Disable "send document as email" icon in preview mode.

Change-Id: I8e73e30354b08a140e2dfc4d4e4f54fb31a85c6b

diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi
index 2117128..530dbc2 100644
--- a/sc/sdi/prevwsh.sdi
+++ b/sc/sdi/prevwsh.sdi
@@ -162,6 +162,7 @@ interface TablePrintPreview
 
 SID_SAVEDOC [ StateMethod = GetState; Export = FALSE; ]
 SID_SAVEASDOC   [ StateMethod = GetState; Export = FALSE; ]
+SID_MAIL_SENDDOC[ StateMethod = GetState; Export = FALSE; ]
 }
 
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 1e556f0..ebc4e68 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -841,6 +841,7 @@ void ScPreviewShell::GetState( SfxItemSet& rSet )
 case SID_REPEAT:
 case SID_SAVEDOC:
 case SID_SAVEASDOC:
+case SID_MAIL_SENDDOC:
 rSet.DisableItem(nWhich);
 break;
 case SID_PREVIEW_PREVIOUS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com

[Norbert Thiebaud]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6bc6c351144ae10c29d4747a4c40f80554f272f
Author: Norbert Thiebaud 
Date:   Tue Jun 5 18:14:52 2012 -0500

fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79

Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 94b4e40..6be5b36 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -291,6 +291,7 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 bexecute = getRecordParser().executeCommand(nCommandType); 
//sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, 
true);
 if (bexecute)
 {
+DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
 if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

[Norbert Thiebaud]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b255de87082d11a42d7af7860dcc4e971342df06
Author: Norbert Thiebaud 
Date:   Tue Jun 5 18:14:52 2012 -0500

fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79

Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 94b4e40..6be5b36 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -291,6 +291,7 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 bexecute = getRecordParser().executeCommand(nCommandType); 
//sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, 
true);
 if (bexecute)
 {
+DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
 if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

[Michael Stahl]

 ucb/source/core/ucb.cxx  |4 ++--
 ucb/source/inc/regexpmap.hxx |2 --
 ucb/source/inc/regexpmap.tpt |   14 ++
 3 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 33839f90e6f8275a584b483827585a6da05aab75
Author: Michael Stahl 
Date:   Tue Jun 5 23:37:15 2012 +0200

ucb: try to fix weird STL assertion on tinderbox

Seems there's uninitialized iterators somewhere, let's try if removing
the silly default constructor here improves anything.

Change-Id: I2ba239df9b532805e177378f9fa35023d087716a

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 64a412b..fec9972 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -399,7 +399,7 @@ UniversalContentBroker::registerContentProvider(
 {
 osl::MutexGuard aGuard(m_aMutex);
 
-ProviderMap_Impl::iterator aIt;
+ProviderMap_Impl::iterator aIt(m_aProviders.end());
 try
 {
 aIt = m_aProviders.find(Scheme);
@@ -445,7 +445,7 @@ void SAL_CALL 
UniversalContentBroker::deregisterContentProvider(
 {
 osl::MutexGuard aGuard(m_aMutex);
 
-ProviderMap_Impl::iterator aMapIt;
+ProviderMap_Impl::iterator aMapIt(m_aProviders.end());
 try
 {
 aMapIt = m_aProviders.find(Scheme);
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index 717a077..e023633 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -101,8 +101,6 @@ class RegexpMapIter: public RegexpMapConstIter< Val >
 friend class RegexpMap< Val >; // to access ctor
 
 public:
-RegexpMapIter() {}
-
 RegexpMapIter & operator ++();
 
 RegexpMapIter operator ++(int);
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 4fe69a6..0090029 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -74,10 +74,6 @@ public:
typedef RegexpMapImpl< Val > MapImpl;
typedef typename List< Val >::iterator ListIterator;
 
-   // Solaris needs these for the ctor...
-
-   inline RegexpMapIterImpl();
-
inline RegexpMapIterImpl(MapImpl * pTheMap, int nTheList,
 ListIterator 
aTheIndex);
 
@@ -96,6 +92,8 @@ public:
RegexpMapEntry< Val > & get();
 
 private:
+RegexpMapIterImpl(); // not implemented
+
mutable RegexpMapEntry< Val > m_aEntry;
typename List< Val >::iterator m_aIndex;
RegexpMapImpl< Val > * m_pMap;
@@ -108,14 +106,6 @@ private:
 }
 
 template< typename Val >
-inline RegexpMapIterImpl< Val >::RegexpMapIterImpl():
-   m_aEntry(rtl::OUString(), 0),
-   m_pMap(0),
-   m_nList(-1),
-   m_bEntrySet(false)
-{}
-
-template< typename Val >
 inline RegexpMapIterImpl< Val >::RegexpMapIterImpl(MapImpl * pTheMap,

   int nTheList,

   ListIterator aTheIndex):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: udk module fails to compile

[julien2412]

I did this :
make codemaker.clean && make codemaker && make codemaker.deliver

then :
make rdbmaker.clean && make rdbmaker

finally :
make udkapi.clean && make udkapi

it worked... Great but what to think about it ?

Now I hope to be able to compile the rest of master sources again.

Julien.

--
View this message in context: 
http://nabble.documentfoundation.org/udk-module-fails-to-compile-tp3987690p3988392.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements' - 7 commits - chart2/Library_chartview.mk chart2/source drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/Package_inc.

[Artur Dorda]

 .gitignore |3 
 chart2/Library_chartview.mk|1 
 chart2/source/view/main/ChartView.cxx  |   26 +-
 drawinglayer/Library_drawinglayer.mk   |6 
 drawinglayer/Package_inc.mk|1 
 drawinglayer/inc/drawinglayer/XShapeDumper.hxx |   57 ++
 drawinglayer/source/dumper/XShapeDumper.cxx|  229 +
 7 files changed, 308 insertions(+), 15 deletions(-)

New commits:
commit 80caec227b57958f87a0f2be21c0dd99a7a4c123
Author: Artur Dorda 
Date:   Tue Jun 5 02:35:35 2012 +0200

Added dumping [property] FillTransparenceGradientName + corrected method 
calls

Change-Id: I882d1d4ebe0bef6ac23eb25117d52e460223bb29

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx 
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 744b462..4b77fb7 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -46,6 +46,7 @@ private:
 void dumpFillStyleAsAttribute(com::sun::star::drawing::FillStyle 
eFillStyle, xmlTextWriterPtr xmlWriter);
 void dumpFillColorAsAttribute(sal_Int32 aColor, xmlTextWriterPtr 
xmlWriter);
 void dumpFillTransparenceAsAttribute(sal_Int32 aTransparence, 
xmlTextWriterPtr xmlWriter);
+void dumpFillTransparenceGradientNameAsAttribute(rtl::OUString 
aTranspGradName, xmlTextWriterPtr xmlWriter);
 void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter);
 void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize, 
xmlTextWriterPtr xmlWriter);
 void dumpShapeDescriptorAsAttribute( com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapeDescriptor > xDescr, xmlTextWriterPtr xmlWriter 
);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx 
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 22c5873..55bfc6f 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -67,19 +67,19 @@ namespace {
 switch(eFillStyle)
 {
 case drawing::FillStyle_NONE:
-xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("FillStyle"), "%s", "NONE");
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("fillStyle"), "%s", "NONE");
 break;
 case drawing::FillStyle_SOLID:
-xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("FillStyle"), "%s", "SOLID");
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("fillStyle"), "%s", "SOLID");
 break;
 case drawing::FillStyle_GRADIENT:
-xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("FillStyle"), "%s", "GRADIENT");
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("fillStyle"), "%s", "GRADIENT");
 break;
 case drawing::FillStyle_HATCH:
-xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("FillStyle"), "%s", "HATCH");
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("fillStyle"), "%s", "HATCH");
 break;
 case drawing::FillStyle_BITMAP:
-xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("FillStyle"), "%s", "BITMAP");
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("fillStyle"), "%s", "BITMAP");
 break;
 default:
 break;
@@ -88,12 +88,18 @@ namespace {
 
 void XShapeDumper::dumpFillColorAsAttribute(sal_Int32 aColor, 
xmlTextWriterPtr xmlWriter)
 {
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"), 
"%" SAL_PRIdINT32, aColor);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillColor"), 
"%" SAL_PRIdINT32, aColor);
 }
 
 void XShapeDumper::dumpFillTransparenceAsAttribute(sal_Int32 
aTransparence, xmlTextWriterPtr xmlWriter)
 {
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"), 
"%" SAL_PRIdINT32, aTransparence);
+xmlTextWriterWriteFormatAttribute(xmlWriter, 
BAD_CAST("fillTransparence"), "%" SAL_PRIdINT32, aTransparence);
+}
+
+void 
XShapeDumper::dumpFillTransparenceGradientNameAsAttribute(rtl::OUString 
aTranspGradName, xmlTextWriterPtr xmlWriter)
+{
+xmlTextWriterWriteFormatAttribute(xmlWriter, 
BAD_CAST("fillTransparenceGradientName"), "%s",
+rtl::OUStringToOString(aTranspGradName, 
RTL_TEXTENCODING_UTF8).getStr());
 }
 
 void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter)
@@ -166,7 +172,13 @@ namespace {
 uno::Any anotherAny = 
xPropSet->getPropertyValue("FillTransparence");
 sal_Int32 aTransparence;
 if(anotherAny >>= aTransparence)
-dumpFillColorAsAttribute(aTransparence, xmlWriter);
+dumpFillTranspa

[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf

[Fridrich Strba]

 distro-configs/LibreOfficeLinux.conf |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 870b8a32641036d46cc381ce83d66022daf0d9f5
Author: Fridrich Å trba 
Date:   Tue Jun 5 14:57:25 2012 +0200

This option does not exist anymore

Change-Id: I748976e284e1812035f18abac628f0b2397d74c7
Signed-off-by: Fridrich Å trba 

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 4b77cba..499d30a 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -37,7 +37,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-nlpsolver
 --enable-epm
---enable-cairo
 --enable-binfilter
 --enable-python=internal
 --enable-online-update
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - np_sdk/mozsrc

[Michael Stahl]

 np_sdk/mozsrc/npunix.c |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 2787968e044c0c83e7affb0a4c3375178dfa783c
Author: Michael Stahl 
Date:   Tue Jun 5 22:55:02 2012 +0200

np_sdk: it looks like the NP_* functions need exporting

At least, that's what the documentation says, and they used to be
exported before gbuildization of extensions/np_sdk.

Change-Id: Id0bcfab65c30de96bc2c0c708885ae9ed51c3519
(cherry picked from commit 50cc97689e1ceb7754505d7c5b99510e48dbe674)

diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index b99a545..0b5ff38 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -51,6 +51,8 @@
  *--
  */
 
+#include  // just for SAL_DLLPUBLIC_EXPORT
+
 #define XP_UNIX 1
 
 #include 
@@ -365,7 +367,7 @@ Private_GetJavaClass(void)
  *  - Netscape uses the return value to identify when an object instance
  *of this plugin should be created.
  */
-char *
+SAL_DLLPUBLIC_EXPORT char *
 NP_GetMIMEDescription(void)
 {
 return (char *)NPP_GetMIMEDescription();
@@ -377,7 +379,7 @@ NP_GetMIMEDescription(void)
  *  - Interfaces with plugin to get values for predefined variables
  *that the navigator needs.
  */
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NP_GetValue(void* future, NPPVariable variable, void *value)
 {
 return NPP_GetValue(future, variable, value);
@@ -400,7 +402,7 @@ NP_GetValue(void* future, NPPVariable variable, void *value)
  *library will use this function table to call the plugin.
  *
  */
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 {
 NPError err = NPERR_NO_ERROR;
@@ -496,7 +498,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* 
pluginFuncs)
  *the last object of this kind has been destroyed.
  *
  */
-void
+SAL_DLLPUBLIC_EXPORT void
 NP_Shutdown(void)
 {
 PLUGINDEBUGSTR("NP_Shutdown");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: np_sdk/mozsrc

[Michael Stahl]

 np_sdk/mozsrc/npunix.c |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 50cc97689e1ceb7754505d7c5b99510e48dbe674
Author: Michael Stahl 
Date:   Tue Jun 5 22:55:02 2012 +0200

np_sdk: it looks like the NP_* functions need exporting

At least, that's what the documentation says, and they used to be
exported before gbuildization of extensions/np_sdk.

Change-Id: Id0bcfab65c30de96bc2c0c708885ae9ed51c3519

diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c
index b99a545..0b5ff38 100644
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
@@ -51,6 +51,8 @@
  *--
  */
 
+#include  // just for SAL_DLLPUBLIC_EXPORT
+
 #define XP_UNIX 1
 
 #include 
@@ -365,7 +367,7 @@ Private_GetJavaClass(void)
  *  - Netscape uses the return value to identify when an object instance
  *of this plugin should be created.
  */
-char *
+SAL_DLLPUBLIC_EXPORT char *
 NP_GetMIMEDescription(void)
 {
 return (char *)NPP_GetMIMEDescription();
@@ -377,7 +379,7 @@ NP_GetMIMEDescription(void)
  *  - Interfaces with plugin to get values for predefined variables
  *that the navigator needs.
  */
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NP_GetValue(void* future, NPPVariable variable, void *value)
 {
 return NPP_GetValue(future, variable, value);
@@ -400,7 +402,7 @@ NP_GetValue(void* future, NPPVariable variable, void *value)
  *library will use this function table to call the plugin.
  *
  */
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 {
 NPError err = NPERR_NO_ERROR;
@@ -496,7 +498,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* 
pluginFuncs)
  *the last object of this kind has been destroyed.
  *
  */
-void
+SAL_DLLPUBLIC_EXPORT void
 NP_Shutdown(void)
 {
 PLUGINDEBUGSTR("NP_Shutdown");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Re: [REVIEW 3-5] fdo#48932 speed up scrolling/typing in huge writer documents

[Michael Stahl]

On 24/05/12 10:12, Caolán McNamara wrote:
> fdo#48932 is a large 7000 page document which reacts very slowly on text
> input and scrolling around. It appears to be mostly managing the
> header/footer and page break indicators which makes it sluggish
> 
> b63766b3dd453a82f59db505c736d861f662cc0f make it fast again, and seem to
> have no side efforts. Though I'd like to have someone else verify that.

so i was concerned about the lifecycle of these SwFrm, but it seems that
these things only handle SwPageFrms and the dtor of SwPageFrm calls
RemoveControls(this), so it looks safe to me.

> Attached is a backport to 3-5 to apply cleanly.

pushed to libreoffice-3-5

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Michael Stahl]

 sw/source/ui/docvw/FrameControlsManager.cxx |  110 
 sw/source/ui/inc/FrameControlsManager.hxx   |6 +
 2 files changed, 37 insertions(+), 79 deletions(-)

New commits:
commit 4bc06051d1bf484a6f98186f0a2d168b3d98b9cc
Author: Caolán McNamara 
Date:   Thu May 24 08:57:17 2012 +0100

Resolves: fdo#48932 super slow typing and scrolling in large documents

AFAICS it appears that theres a one to one mapping from a SwFrameControl to
a SwFrm, so in any of the three given classes of Page, Footer or Header a
SwFrm will have zero or one SwFrameControls and a SwFrameControl doesn't
get rebound to a different SwFrm or anything like that, so we can use
a map and index off the SwFrm* to find them rather than constantly
looping over vectors to find the right one.

Maybe could move the SwFrameControl directly in the SwPageFrm's
themselves.

Change-Id: I4de0a34f657143ef2d4409b604cc8e114dad132f

Signed-off-by: Michael Stahl 

diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx 
b/sw/source/ui/docvw/FrameControlsManager.cxx
index 5c00b58..1413942 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -37,21 +37,6 @@
 
 using namespace std;
 
-namespace
-{
-class FramePredicate
-{
-const SwFrm* m_pToMatch;
-
-public:
-FramePredicate( const SwFrm* pFrm ) : m_pToMatch( pFrm ) { };
-virtual ~FramePredicate() {};
-
-virtual bool operator()( SwFrameControlPtr pToCheck )
-{ return m_pToMatch == pToCheck->GetFrame(); };
-};
-}
-
 SwFrameControlsManager::SwFrameControlsManager( SwEditWin* pEditWin ) :
 m_pEditWin( pEditWin ),
 m_aControls( )
@@ -60,14 +45,6 @@ SwFrameControlsManager::SwFrameControlsManager( SwEditWin* 
pEditWin ) :
 
 SwFrameControlsManager::~SwFrameControlsManager()
 {
-map< FrameControlType, vector< SwFrameControlPtr > >::iterator pIt = 
m_aControls.begin();
-
-while ( pIt != m_aControls.end() )
-{
-pIt->second.clear( );
-++pIt;
-}
-m_aControls.clear();
 }
 
 SwFrameControlsManager::SwFrameControlsManager( const SwFrameControlsManager& 
rCopy ) :
@@ -85,75 +62,66 @@ const SwFrameControlsManager& 
SwFrameControlsManager::operator=( const SwFrameCo
 
 SwFrameControlPtr SwFrameControlsManager::GetControl( FrameControlType eType, 
const SwFrm* pFrm )
 {
-SwFrameControlPtr pControl;
-
-vector< SwFrameControlPtr >& aControls = m_aControls[eType];
+SwFrameControlPtrMap& rControls = m_aControls[eType];
 
-vector< SwFrameControlPtr >::iterator pIt = find_if(
-aControls.begin(), aControls.end( ), FramePredicate( pFrm ) );
+SwFrameControlPtrMap::iterator aIt = rControls.find(pFrm);
 
-if ( pIt != aControls.end() )
-pControl = *pIt;
+if (aIt != rControls.end())
+return aIt->second;
 
-return pControl;
+return SwFrameControlPtr();
 }
 
-std::vector< SwFrameControlPtr >& SwFrameControlsManager::GetControls( 
FrameControlType eType )
+SwFrameControlPtrMap& SwFrameControlsManager::GetControls( FrameControlType 
eType )
 {
 return m_aControls[eType];
 }
 
 void SwFrameControlsManager::AddControl( FrameControlType eType, 
SwFrameControlPtr pControl )
 {
-m_aControls[eType].push_back( pControl );
+m_aControls[eType].insert(make_pair(pControl->GetFrame(), pControl));
 }
 
 void SwFrameControlsManager::RemoveControls( const SwFrm* pFrm )
 {
-map< FrameControlType, vector< SwFrameControlPtr > >::iterator pIt = 
m_aControls.begin();
+map< FrameControlType, SwFrameControlPtrMap >::iterator pIt = 
m_aControls.begin();
 
 while ( pIt != m_aControls.end() )
 {
-vector< SwFrameControlPtr >& aVect = pIt->second;
-aVect.erase( remove_if( aVect.begin(),
-aVect.end(),
-FramePredicate( pFrm ) ), aVect.end() );
+SwFrameControlPtrMap& rMap = pIt->second;
+rMap.erase(pFrm);
 ++pIt;
 }
 }
 
 void SwFrameControlsManager::RemoveControlsByType( FrameControlType eType, 
const SwFrm* pFrm )
 {
-vector< SwFrameControlPtr >& aVect = m_aControls[eType];
-aVect.erase( remove_if( aVect.begin(),
-aVect.end(),
-FramePredicate( pFrm ) ), aVect.end() );
+SwFrameControlPtrMap& rMap = m_aControls[eType];
+rMap.erase(pFrm);
 }
 
-
 void SwFrameControlsManager::HideControls( FrameControlType eType )
 {
-vector< SwFrameControlPtr >::iterator pIt = m_aControls[eType].begin();
+SwFrameControlPtrMap::iterator pIt = m_aControls[eType].begin();
 while ( pIt != m_aControls[eType].end() )
 {
-( *pIt )->ShowAll( false );
-pIt++;
+pIt->second->ShowAll( false );
+++pIt;
 }
 }
 
 void SwFrameControlsManager::SetReadonlyControls( bool bReadonly )
 {
-map< FrameControlType, vector< SwFrameC

Re: [ANN] Referencing bugs in commits

[Lionel Elie Mamane]

On Tue, Feb 14, 2012 at 04:16:33PM +0100, Jan Holesovsky wrote:

> Markus has implemented a nice feature that should help keeping the bugs
> up to date: whenever you are committing / pushing to git, and you
> reference the bugs.freedesktop.org bug in the commit message, it will
> automatically appear as a comment in the bug :-)

It now sets weird targets for commits to libreoffice-3-6:

 target:3.6.3.6Beta1 in fdo#47473
 3.6Beta1 in fdo#47325

(the last is without target, was manually corrected by human later)

>From what I remember from the documentation of target: on the wiki, it
should not have "beta", so that queries stay sane, only 3.6.0. OTOH, I
very much agree that the info of in which beta/rc it is supposed to be
fixed is *very* useful for checking that the bug is really fixed!


-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

[Thomas Arnhold]

Hi,

I've fixed my introduced regression:

on master: 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=76dcd76509ec0b2078a95f282e09696a8e91cbb0


And with these two attachments for 3-5 and 3-6 branch. Would be nice if 
someone could check and sign it.


Thomas
>From cba811c7b8b50e04236ee9022d0ca94c0b8cd7ad Mon Sep 17 00:00:00 2001
From: Thomas Arnhold 
Date: Mon, 4 Jun 2012 18:21:58 +0200
Subject: [PATCH] fdo#50415 and fdo#34638 Fix Shortcut names are not localized
 on Linux

This partially reverts commit 2233aa52da14ec85331aee1163b885fe9a9fb507

Before the keyboard name was used to determine the target language
for translation of UI shortcuts. With this patch the UI locale
is used to determine the language.

Related to:
- 8d9e2d9a211f710e91ac7c607fea25895282d245
- 04b9c2f633f0be1b676933943bdd0b1dc58b5471

Change-Id: I14c6759dc405db490d210a78ce19e1416efb7ac7
---
 vcl/Library_vclplug_gen.mk  |1 +
 vcl/inc/unx/saldisp.hxx |9 +
 vcl/unx/generic/app/keysymnames.cxx |  372 +++
 vcl/unx/generic/app/saldisp.cxx |   21 +-
 4 files changed, 396 insertions(+), 7 deletions(-)
 create mode 100644 vcl/unx/generic/app/keysymnames.cxx

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 3ff257a..c018a9d 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
 vcl/unx/generic/app/i18n_status \
 vcl/unx/generic/app/i18n_wrp \
 vcl/unx/generic/app/i18n_xkb \
+vcl/unx/generic/app/keysymnames \
 vcl/unx/generic/app/randrwrapper \
 vcl/unx/generic/app/saldata \
 vcl/unx/generic/app/saldisp \
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index fce2a68..c83b42b 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -434,6 +434,15 @@ public:
 voidSetupInput( SalI18N_InputMethod *pInputMethod );
 };
 
+
+// get foreign key names
+namespace vcl_sal {
+rtl::OUString getKeysymReplacementName(
+rtl::OUString pLang,
+KeySym nSymbol );
+}
+
+
 #endif // _SV_SALDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
new file mode 100644
index 000..bc1d705
--- /dev/null
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -0,0 +1,372 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#if !defined(SOLARIS) && !defined(AIX)
+#include 
+#include 
+#include 
+#endif
+
+#include 
+#include 
+#include 
+
+#if !defined (SunXK_Undo)
+#define SunXK_Undo  0xFF65  // XK_Undo
+#define SunXK_Again 0xFF66  // XK_Redo
+#define SunXK_Find  0xFF68  // XK_Find
+#define SunXK_Stop  0xFF69  // XK_Cancel
+#define SunXK_Props 0x1005FF70
+#define SunXK_Front 0x1005FF71
+#define SunXK_Copy  0x1005FF72
+#define SunXK_Open  0x1005FF73
+#define SunXK_Paste 0x1005FF74
+#define SunXK_Cut   0x1005FF75
+#endif
+
+#include 
+#include 
+
+namespace vcl_sal {
+
+struct KeysymNameReplacement
+{
+KeySym  aSymbol;
+const char* pName;
+};
+
+struct KeyboardReplacements
+{
+const char* pLangName;
+const KeysymNameReplacement*pReplacements;
+int nReplacements;
+};
+
+// 
+//
+// CAUTION CAUTION CAUTION
+// every string value in the replacements tables must be in UTF8
+// be careful with your editor !
+//
+// 
+
+static const struct KeysymNameReplacement aImplReplacements_Eng

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - filter/source

[Kohei Yoshida]

 filter/source/config/cache/typedetection.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8d004941ee0d82c5a3b6f14d46c59babf0cd63c
Author: Kohei Yoshida 
Date:   Tue Jun 5 16:29:53 2012 -0400

Fix the description.

Change-Id: Ib30a77808b9f4726e72f57e9d9ea73c71f5cac34

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index c831935..49e5e24 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -196,8 +196,8 @@ int getFlatTypeRank(const rtl::OUString& rType)
 return n - i - 1;
 }
 
-// Not ranked.  Treat them equally.  Unranked filters have higher priority
-// than the ranked internal ones since they may be external filters.
+// Not ranked.  Treat them equally.  Unranked formats have higher priority
+// than the ranked internal ones since they may be defined externally.
 return n;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

[Kohei Yoshida]

 filter/source/config/cache/typedetection.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20e9663e3342c8c619e404ae7f6392ce50a9dc89
Author: Kohei Yoshida 
Date:   Tue Jun 5 16:29:53 2012 -0400

Fix the description.

Change-Id: Ib30a77808b9f4726e72f57e9d9ea73c71f5cac34

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index c831935..49e5e24 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -196,8 +196,8 @@ int getFlatTypeRank(const rtl::OUString& rType)
 return n - i - 1;
 }
 
-// Not ranked.  Treat them equally.  Unranked filters have higher priority
-// than the ranked internal ones since they may be external filters.
+// Not ranked.  Treat them equally.  Unranked formats have higher priority
+// than the ranked internal ones since they may be defined externally.
 return n;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'features/base-preview'

[Lionel Elie Mamane]

New branch 'features/base-preview' available with the following commits:
commit acfe9ddc71c73d627d6b25c1baf09edf368ecbf1
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:30:40 2012 +0200

fdo#47473 try to set new order only after field columns are available

Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d

commit 791281a1c7090d6d667dabd1e4e0f0852233f1ba
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

 - Data must be fetched in increasing order of column number
   (again, this is about SQLGetData).

   This is a harder issue. The current solution has the nice advantage
   of completely isolating the rest of LibO from these restrictions.

   I don't currently see how to cleanly avoid (potentially
   unnecessarily) caching column 4 if we are asked for column 3 then
   column 5, just in case we are asked for column 4 later on, unless
   we issue a specific "SELECT column4" later. But the latter would be
   quite expensive in terms of app-to-database roudtripe times :-( and
   thus creates another performance issue.

Change-Id: I999b3f8f0b8a215acb390ffefc839235346e8353

commit 1ee778a9173c340f399e12b8f026ff3bf6e50c2d
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:41:33 2012 +0200

Need to refresh row after moving to bookmark!

Change-Id: Ia8d12d02829087309e248506a7d3b0f94b5a425e

commit c3cc44a90b7dd3bf373226d9c0f67cb1c0216d96
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:40:30 2012 +0200

Cleanup m_xSet in destructor

Change-Id: I3d7023fcb1857da1ef107a8af0d373b9ca464f03

commit a2523d0d42f97fe2ea0a7559195f2e6008ffaf9d
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:35:52 2012 +0200

typos in comments

Change-Id: I1dbb1990033602d7909ecdee72b8b699cce44cab

commit 6068bb5753847b8439fb73e661807501fcdc790b
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:31:25 2012 +0200

Remove wrong optimisation

fixup of d4ae29a37873843c20fe7d5f5f071f8fb201fed9
after the call to m_pCacheSet->absolute_checked, the data *is* used,
so we cannot anymore exempt m_pCacheSet from giving correct data.

Chang

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

[Lionel Elie Mamane]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-5] fdo#50139 do not cut first character of field text

[Andras Timar]

Hi,

The patch below resolves fdo#50139 and its seven duplicates in fdo,
not to mention http://bug.openscope.org/browse/OOO-402 which was
opened by a senior Hungarian teacher and technical writer, who asked
me for a fix several times.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=f2bcd32bfd92f85ad4d94b4e40542dc419b3e2c2

Please cherry-pick it to libreoffice-3-5. The history of the bug
started at fdo#34872.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] [REVIEW:3-5] fdo#47473 legacy reports created in 3.5 fail to open

[Lionel Elie Mamane]

Legacy reports (not Sun/Oracle Report Builder ones) created by the
wizard in LibreOffice 3.5 or later fail to open (in LibreOffice 3.5
and later): show empty data.

To correct i#98163, LibO 3.5 leaves the Command hidden control value
empty, this is the signal that on opening, it should fetch the current
definition of the query (in QueryName hidden control); that change is
inherited from a OO.org 3.4 CWS...

The problem was within the prependSortCriteria() method call. It tries
to use (deeper withing subobjects) metadata about columns that gets
initialised only at ->execute time, and thus all this code raised an
exception (null pointer). So I moved it to after the execute(), but
then we have to ->execute again so that it gets taken into
account... Hmmm... There is probably a better solution, but this one
works for now.


Please apply to libreoffice-3-5 branch.

-- 
Lionel
>From 183ac99a1ceebd08f750963dce6170656a201626 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane 
Date: Tue, 5 Jun 2012 21:30:40 +0200
Subject: [PATCH] fdo#47473 try to set new order only after field columns are
 available

Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d
---
 .../wizards/report/ReportTextImplementation.java   |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index c45d282..94b4e40 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -279,7 +279,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 {
 getRecordParser().Command = (String) oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
 getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-getRecordParser().getSQLQueryComposer().prependSortingCriteria();
 getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery();
 }
 else
@@ -293,6 +292,12 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 if (bexecute)
 {
 bexecute = getRecordParser().getFields(sFieldNameList, true);
+if (bexecute && getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+{
+getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery();
+bexecute = getRecordParser().executeCommand(nCommandType);
+}
 }
 return bexecute;
 }
-- 
1.7.9

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: udk module fails to compile

[julien2412]

Thought it was ok, I was wrong :-(

So I compiled udkapi in verbose mode and got :
julien@julienPC:~/compile-libreoffice/libo$ make verbose=t udkapi
make -r -f /home/julien/compile-libreoffice/libo/Makefile.top udkapi
make[1]: Entering directory `/home/julien/compile-libreoffice/libo'
cd udkapi && make -j 4 -r gb_PARTIALBUILD=T
[ build HPP ] udkapi
make[2]: Entering directory `/home/julien/compile-libreoffice/libo/udkapi'
RESPONSEFILE=/tmp/gbuild.hymXHy &&
LD_LIBRARY_PATH="/home/julien/compile-libreoffice/libo/solver/unxlngx6/lib"
SOLARBINDIR=/home/julien/compile-libreoffice/libo/solver/unxlngx6/bin
/home/julien/compile-libreoffice/libo/solver/unxlngx6/bin/cppumaker
@${RESPONSEFILE} && rm -f ${RESPONSEFILE} && touch
/home/julien/compile-libreoffice/libo/workdir/unxlngx6/UnoApiHeadersTarget/udkapi/normal.done
Segmentation fault
make[2]: ***
[/home/julien/compile-libreoffice/libo/workdir/unxlngx6/UnoApiHeadersTarget/udkapi/normal.done]
Error 139
make[2]: Leaving directory `/home/julien/compile-libreoffice/libo/udkapi'
make[1]: *** [udkapi] Error 2
make[1]: Leaving directory `/home/julien/compile-libreoffice/libo'
make: *** [udkapi] Error 2

After having exported LD_LIBRARY_PATH + SOLARBINDIR, I launched gdb :
gdb /home/julien/compile-libreoffice/libo/solver/unxlngx6/bin/cppumaker
then :
(gdb) run -Gc -L -BUCR
-O/home/julien/compile-libreoffice/libo/workdir/unxlngx6/UnoApiHeadersTarget/udkapi/normal
/home/julien/compile-libreoffice/libo/workdir/unxlngx6/UnoApiTarget/udkapi.rdb


Hopefully I get the bt :
Program received signal SIGSEGV, Segmentation fault.
0x004347ce in
boost::unordered_detail::hash_table, std::allocator >
>::find_iterator (this=0x7fffdf20, bucket_=0x40, k="com") at
/home/julien/compile-libreoffice/libo/solver/unxlngx6/inc/boost/unordered/detail/table.hpp:55
55  node_ptr it = bucket_->next_;
(gdb) bt
#0  0x004347ce in
boost::unordered_detail::hash_table, std::allocator >
>::find_iterator (this=0x7fffdf20, bucket_=0x40, k="com") at
/home/julien/compile-libreoffice/libo/solver/unxlngx6/inc/boost/unordered/detail/table.hpp:55
#1  0x0043222e in
boost::unordered_detail::hash_table, std::allocator > >::find
(this=0x7fffdf20, k="com") at
/home/julien/compile-libreoffice/libo/solver/unxlngx6/inc/boost/unordered/detail/table.hpp:583
#2  0x004303ef in boost::unordered_set,
std::allocator >::find (this=0x7fffdf20, k="com")
at
/home/julien/compile-libreoffice/libo/solver/unxlngx6/inc/boost/unordered/unordered_set.hpp:411
#3  0x0042fd95 in codemaker::GeneratedTypeSet::contains
(this=0x7fffdf20, type="com")
at
/home/julien/compile-libreoffice/libo/codemaker/inc/codemaker/generatedtypeset.hxx:69
#4  0x0042e0b7 in produceType (rTypeKey=..., bIsExtraType=false,
typeMgr=..., generated=..., pOptions=0x7fffde70)
at
/home/julien/compile-libreoffice/libo/codemaker/source/cppumaker/cpputype.cxx:4446
#5  0x004054ab in (anonymous namespace)::produce (rTypeKey=...,
bIsExtraType=false, typeMgr=..., generated=..., options=0x7fffde70)
at
/home/julien/compile-libreoffice/libo/codemaker/source/cppumaker/cppumaker.cxx:55
#6  0x004055fe in (anonymous namespace)::produceAllTypes
(rTypeKey=..., bIsExtraType=false, typeMgr=..., generated=...,
pOptions=0x7fffde70, bFullScope=1 '\001')
at
/home/julien/compile-libreoffice/libo/codemaker/source/cppumaker/cppumaker.cxx:79
#7  0x00405c20 in (anonymous namespace)::produceAllTypes
(typeName="/", typeMgr=..., generated=..., pOptions=0x7fffde70,
bFullScope=1 '\001')
at
/home/julien/compile-libreoffice/libo/codemaker/source/cppumaker/cppumaker.cxx:136
#8  0x0040642d in sal_main_with_args (argc=6, argv=0x7fffe208)
at
/home/julien/compile-libreoffice/libo/codemaker/source/cppumaker/cppumaker.cxx:224
#9  0x00405e51 in main (argc=6, argv=0x7fffe208) at
/home/julien/compile-libreoffice/libo/codemaker/source/cppumaker/cppumaker.cxx:151

Any idea ?

Julien.

--
View this message in context: 
http://nabble.documentfoundation.org/udk-module-fails-to-compile-tp3987690p3988371.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

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 45049, which changed state.

Bug 45049 Summary: Non-standard caption number and reference do not appear in 
the insert cross-reference dialog
https://bugs.freedesktop.org/show_bug.cgi?id=45049

   What|Old Value   |New Value

 Resolution||DUPLICATE
 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] .: Branch 'libreoffice-3-6' - filter/source

[Kohei Yoshida]

 filter/source/config/cache/typedetection.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ae306e093a323f3233eea11a71f472ec7f89cf69
Author: Kohei Yoshida 
Date:   Tue Jun 5 15:53:31 2012 -0400

Prioritize external filters over the internal ones.

Change-Id: I2407a2ebc01f39655b30f7eb1e65deb912f2e606

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 672a09f..c831935 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -196,8 +196,9 @@ int getFlatTypeRank(const rtl::OUString& rType)
 return n - i - 1;
 }
 
-// Not ranked.  Treat them equally.
-return -1;
+// Not ranked.  Treat them equally.  Unranked filters have higher priority
+// than the ranked internal ones since they may be external filters.
+return n;
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

[Kohei Yoshida]

 filter/source/config/cache/typedetection.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eed0a0b26b9d61d26c888423c4e3d83b61728e3f
Author: Kohei Yoshida 
Date:   Tue Jun 5 15:53:31 2012 -0400

Prioritize external filters over the internal ones.

Change-Id: I2407a2ebc01f39655b30f7eb1e65deb912f2e606

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 672a09f..c831935 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -196,8 +196,9 @@ int getFlatTypeRank(const rtl::OUString& rType)
 return n - i - 1;
 }
 
-// Not ranked.  Treat them equally.
-return -1;
+// Not ranked.  Treat them equally.  Unranked filters have higher priority
+// than the ranked internal ones since they may be external filters.
+return n;
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Andras Timar]

 sw/source/core/fields/expfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89fbb7fc5a71a98f187ebb159ace053f7a28d291
Author: Andras Timar 
Date:   Tue Jun 5 21:51:45 2012 +0200

fdo#50139 do not cut first character of field text

Change-Id: Ia80e0bc0540259f9a752452ad677c645c97fc7f5

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 4888bd8..53a90d3 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -607,7 +607,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& 
rList )
 pNd->GetNodes().IsDocNodes() )
 {
 _SeqFldLstElem* pNew = new _SeqFldLstElem(
-pNd->GetExpandTxt( 1, (*pF->GetTxtFld()->GetStart()) ),
+pNd->GetExpandTxt( 0, (*pF->GetTxtFld()->GetStart()) + 1 ),
 ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
 rList.InsertSort( pNew );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Andras Timar]

 sw/source/core/fields/expfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2bcd32bfd92f85ad4d94b4e40542dc419b3e2c2
Author: Andras Timar 
Date:   Tue Jun 5 21:51:45 2012 +0200

fdo#50139 do not cut first character of field text

Change-Id: Ia80e0bc0540259f9a752452ad677c645c97fc7f5

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 4888bd8..53a90d3 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -607,7 +607,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& 
rList )
 pNd->GetNodes().IsDocNodes() )
 {
 _SeqFldLstElem* pNew = new _SeqFldLstElem(
-pNd->GetExpandTxt( 1, (*pF->GetTxtFld()->GetStart()) ),
+pNd->GetExpandTxt( 0, (*pF->GetTxtFld()->GetStart()) + 1 ),
 ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
 rList.InsertSort( pNew );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sfx2/source

[Kohei Yoshida]

 sfx2/source/bastyp/fltfnc.cxx |   37 +++--
 1 file changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 70e4fd2a10f9d7255285d26fe8fec22b18858116
Author: Kohei Yoshida 
Date:   Tue Jun 5 15:45:52 2012 -0400

fdo#50694: Honor the preferred filter returned by type detection.

Because that filter is more reliable.

Change-Id: Ifbab294bf4f344301410cd671a9245bffa03fa11

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index fbb253e..72b3590 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -433,6 +433,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( 
SfxMedium& rMedium, c
 
 ::rtl::OUString sURL( rMedium.GetURLObject().GetMainURL( 
INetURLObject::NO_DECODE ) );
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 
xInStream = rMedium.GetInputStream();
+rtl::OUString aFilterName;
 
 // stream exists => deep detection (with preselection ... if possible)
 if (xInStream.is())
@@ -454,6 +455,13 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( 
SfxMedium& rMedium, c
 
 ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue > lDescriptor = 
aDescriptor.getAsConstPropertyValueList();
 sTypeName = xDetection->queryTypeByDescriptor(lDescriptor, 
sal_True); // lDescriptor is used as In/Out param ... dont use 
aDescriptor.getAsConstPropertyValueList() directly!
+
+for (sal_Int32 i = 0; i < lDescriptor.getLength(); ++i)
+{
+if (lDescriptor[i].Name == "FilterName")
+// Type detection picked a preferred filter for this 
format.
+aFilterName = lDescriptor[i].Value.get();
+}
 }
 // no stream exists => try flat detection without preselection as 
fallback
 else
@@ -461,16 +469,25 @@ sal_uInt32  
SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
 
 if (!sTypeName.isEmpty())
 {
-// detect filter by given type
-// In case of this matcher is bound to a particular document type:
-// If there is no acceptable type for this document at all, the 
type detection has possibly returned something else.
-// The DocumentService property is only a preselection, and all 
preselections are considered as optional!
-// This "wrong" type will be sorted out now because we match only 
allowed filters to the detected type
-::com::sun::star::uno::Sequence< 
::com::sun::star::beans::NamedValue > lQuery(1);
-lQuery[0].Name = ::rtl::OUString("Name");
-lQuery[0].Value <<= sTypeName;
-
-const SfxFilter* pFilter = GetFilterForProps(lQuery, nMust, nDont);
+const SfxFilter* pFilter = NULL;
+if (!aFilterName.isEmpty())
+// Type detection returned a suitable filter for this.  Use it.
+pFilter = SfxFilter::GetFilterByName(aFilterName);
+
+if (!pFilter)
+{
+// detect filter by given type
+// In case of this matcher is bound to a particular document 
type:
+// If there is no acceptable type for this document at all, 
the type detection has possibly returned something else.
+// The DocumentService property is only a preselection, and 
all preselections are considered as optional!
+// This "wrong" type will be sorted out now because we match 
only allowed filters to the detected type
+::com::sun::star::uno::Sequence< 
::com::sun::star::beans::NamedValue > lQuery(1);
+lQuery[0].Name = ::rtl::OUString("Name");
+lQuery[0].Value <<= sTypeName;
+
+pFilter = GetFilterForProps(lQuery, nMust, nDont);
+}
+
 if (pFilter)
 {
 *ppFilter = pFilter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

[Kohei Yoshida]

 sfx2/source/bastyp/fltfnc.cxx |   37 +++--
 1 file changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 3da8f3680556e0163f660a0a159930337c8c32ff
Author: Kohei Yoshida 
Date:   Tue Jun 5 15:45:52 2012 -0400

fdo#50694: Honor the preferred filter returned by type detection.

Because that filter is more reliable.

Change-Id: Ifbab294bf4f344301410cd671a9245bffa03fa11

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index fbb253e..72b3590 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -433,6 +433,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( 
SfxMedium& rMedium, c
 
 ::rtl::OUString sURL( rMedium.GetURLObject().GetMainURL( 
INetURLObject::NO_DECODE ) );
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > 
xInStream = rMedium.GetInputStream();
+rtl::OUString aFilterName;
 
 // stream exists => deep detection (with preselection ... if possible)
 if (xInStream.is())
@@ -454,6 +455,13 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( 
SfxMedium& rMedium, c
 
 ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue > lDescriptor = 
aDescriptor.getAsConstPropertyValueList();
 sTypeName = xDetection->queryTypeByDescriptor(lDescriptor, 
sal_True); // lDescriptor is used as In/Out param ... dont use 
aDescriptor.getAsConstPropertyValueList() directly!
+
+for (sal_Int32 i = 0; i < lDescriptor.getLength(); ++i)
+{
+if (lDescriptor[i].Name == "FilterName")
+// Type detection picked a preferred filter for this 
format.
+aFilterName = lDescriptor[i].Value.get();
+}
 }
 // no stream exists => try flat detection without preselection as 
fallback
 else
@@ -461,16 +469,25 @@ sal_uInt32  
SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
 
 if (!sTypeName.isEmpty())
 {
-// detect filter by given type
-// In case of this matcher is bound to a particular document type:
-// If there is no acceptable type for this document at all, the 
type detection has possibly returned something else.
-// The DocumentService property is only a preselection, and all 
preselections are considered as optional!
-// This "wrong" type will be sorted out now because we match only 
allowed filters to the detected type
-::com::sun::star::uno::Sequence< 
::com::sun::star::beans::NamedValue > lQuery(1);
-lQuery[0].Name = ::rtl::OUString("Name");
-lQuery[0].Value <<= sTypeName;
-
-const SfxFilter* pFilter = GetFilterForProps(lQuery, nMust, nDont);
+const SfxFilter* pFilter = NULL;
+if (!aFilterName.isEmpty())
+// Type detection returned a suitable filter for this.  Use it.
+pFilter = SfxFilter::GetFilterByName(aFilterName);
+
+if (!pFilter)
+{
+// detect filter by given type
+// In case of this matcher is bound to a particular document 
type:
+// If there is no acceptable type for this document at all, 
the type detection has possibly returned something else.
+// The DocumentService property is only a preselection, and 
all preselections are considered as optional!
+// This "wrong" type will be sorted out now because we match 
only allowed filters to the detected type
+::com::sun::star::uno::Sequence< 
::com::sun::star::beans::NamedValue > lQuery(1);
+lQuery[0].Name = ::rtl::OUString("Name");
+lQuery[0].Value <<= sTypeName;
+
+pFilter = GetFilterForProps(lQuery, nMust, nDont);
+}
+
 if (pFilter)
 {
 *ppFilter = pFilter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |9 
+++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 183ac99a1ceebd08f750963dce6170656a201626
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:30:40 2012 +0200

fdo#47473 try to set new order only after field columns are available

Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index c45d282..94b4e40 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -279,7 +279,6 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 {
 getRecordParser().Command = (String) 
oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
 
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
 getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
 }
 else
@@ -293,6 +292,12 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 if (bexecute)
 {
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
+if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+{
+
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
+bexecute = 
getRecordParser().executeCommand(nCommandType);
+}
 }
 return bexecute;
 }
commit f2cd676ee4c5b9137f517b4e69e7dd0baf81b0f4
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:27:25 2012 +0200

untabify

Change-Id: Ic51b50a5b06f2a96750a945754e44a302b070f77

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9b1e1e2..c45d282 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -241,7 +241,7 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 }
 catch (UnknownHiddenControlException exception)
 {
-   sorting = "";
+sorting = "";
 }
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", 
sMsg);
 if (xNamedForm.hasByName("QueryName"))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: f70fe6e6 regression: options dialog is a bit broken

[Ivan Timofeev]

On 05.06.2012 16:40, Caolán McNamara wrote:

On Mon, 2012-06-04 at 11:45 +0400, Ivan Timofeev wrote:

moving controls in every page is a huge tedious work...


All of our hard-coded positions widgetry is hugely miserable. FWIW I've
some experimental stuff in
http://cgit.freedesktop.org/libreoffice/core/log/?h=feature/cmclayout


You definitely can read my thoughts, because I just wanted to ask about 
this stuff and thereby prevent Astron from doing that thankless task. :)


Thanks for the explanations! One question: what is the planned deadline 
(if any)?


Regards,
Ivan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |9 
+++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 32c943e161117e4362ac9246baac2c0fb54e7c79
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:30:40 2012 +0200

fdo#47473 try to set new order only after field columns are available

Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index c45d282..94b4e40 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -279,7 +279,6 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 {
 getRecordParser().Command = (String) 
oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
 
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
 getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
 }
 else
@@ -293,6 +292,12 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 if (bexecute)
 {
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
+if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+{
+
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
+bexecute = 
getRecordParser().executeCommand(nCommandType);
+}
 }
 return bexecute;
 }
commit 98a8512939b3c5f08ca30f62c2cfcd6b93430812
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:27:25 2012 +0200

untabify

Change-Id: Ic51b50a5b06f2a96750a945754e44a302b070f77

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9b1e1e2..c45d282 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -241,7 +241,7 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 }
 catch (UnknownHiddenControlException exception)
 {
-   sorting = "";
+sorting = "";
 }
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", 
sMsg);
 if (xNamedForm.hasByName("QueryName"))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - connectivity/source solenv/inc

[René Engelhard]

 connectivity/source/parse/sqlflex.l |   18 +-
 solenv/inc/unxlngppc.mk |3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit ad5f0ff5479e9aadb8ecce5e6607ba5cba7170c1
Author: Caolán McNamara 
Date:   Mon May 14 13:25:24 2012 +0100

Revert "sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove 
-fsigned-char"

This reverts commit 875c9a28f49c7a73607fcdfac245b648801dccee.
because it doesn't make sense to build the dmake modules
without -fsigned-char and the gbuild modules with -fsigned-char

and we're still got a few bugs where we assume chars are signed

Conflicts:

solenv/inc/unxlngppc.mk

Change-Id: I6ac07fa3ebadd83efd0da1ee69a010b62dfaad59

Signed-off-by: Rene Engelhard 

diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index af528d9..c7f1372 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -31,3 +31,6 @@ DEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DPOWERPC -DPPC
+CFLAGS+=-fsigned-char
+CFLAGSCC+=-fsigned-char
+CFLAGSCXX+=-fsigned-char
commit f0effaee1dc13b972ba8ff7b9a3f68b274487ef1
Author: Caolán McNamara 
Date:   Mon May 14 14:00:59 2012 +0100

ppc: yyinput returns a int, truncating to (unsigned)char does't work

retain this as an int so that on platforms where char is unsigned
we don't mangle the value and get this all wrong.

Fixes database opening tables on ppc if -fsigned-char is removed

Change-Id: I66f0c6b1b19191595f8b348377579f2daabf7ada

Signed-off-by: Rene Engelhard 

diff --git a/connectivity/source/parse/sqlflex.l 
b/connectivity/source/parse/sqlflex.l
index d5b2f14..fd27cb8 100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -76,7 +76,7 @@ using namespace connectivity;
 
 static ::rtl::OUString aEmptyString;
 
-static sal_Int32   gatherString(sal_Int32 delim, sal_Int32 nTyp);
+static sal_Int32   gatherString(int delim, sal_Int32 nTyp);
 static sal_Int32   gatherName(const sal_Char*);
 static sal_Int32   gatherNamePre(const sal_Char* );
 // has to be set before the parser starts
@@ -94,8 +94,8 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
 
 #define YY_INPUT(buf,result,max_size)  \
 {  
\
-   buf[0] = xxx_pGLOBAL_SQLSCAN->SQLyygetc();  \
-   result = buf[0] != -1;  
\
+int c = xxx_pGLOBAL_SQLSCAN->SQLyygetc();  \
+result = (c == EOF) ? YY_NULL : (buf[0] = c, 1);\
 }
 
 #define YY_FATAL_ERROR(msg)
\
@@ -518,9 +518,9 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; }
  * nTyp == 1 -> SQL_NODE_STRING
  * nTyp == 2 -> SQL_NODE_ACCESS_DATE
  */
-sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
+sal_Int32 gatherString(int delim, sal_Int32 nTyp)
 {
-   sal_Char ch;
+   int ch;
::rtl::OStringBuffer sBuffer(256);
 
while (!checkeof(ch = yyinput())) 
@@ -547,7 +547,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
} 
else
{
-   sBuffer.append(ch);
+   sBuffer.append(static_cast(ch));
}
 
} 
@@ -555,7 +555,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
break;  
else
{
-   sBuffer.append(ch);
+   sBuffer.append(static_cast(ch));
}
}
YY_FATAL_ERROR("Unterminated name string"); 
@@ -746,7 +746,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
 
sal_Char *s = Buffer;
sal_Int32 nPos = 1;
-   sal_Int32 ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : 
SQLyytext[0]): ' ';
+   int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): 
' ';
*s++ = ch;
while (!checkeof(ch = yyinput())) 
{
@@ -800,7 +800,7 @@ void OSQLScanner::prepareScan(const ::rtl::OUString & 
rNewStatement, const IPars
 
//--
 sal_Int32 OSQLScanner::SQLyygetc(void)
 {
-   sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? -1 : 
m_sStatement.getStr()[m_nCurrentPos];
+   sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? EOF : 
m_sStatement.getStr()[m_nCurrentPos];
 m_nCurrentPos++;
 return nPos;
 }
___
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 50415, which changed state.

Bug 50415 Summary: Shortcut names are not localized on Linux
https://bugs.freedesktop.org/show_bug.cgi?id=50415

   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

Re: 1.6Gb of workdir/.../Dep - thoughts ...

[Norbert Thiebaud]

On Tue, Jun 5, 2012 at 4:13 AM, Bjoern Michaelsen
 wrote:
> Finished a master build:
>
>    1.2G        workdir/unxlngx6.pro/Dep/
>
> of a:
>
>    5.4G        .
>
> total. Yeah, thats a bit much. Theres:
>
>    644M        workdir/unxlngx6.pro/Dep/CxxObject
>
> which can likely be compressed without much performance impact, giving us back
> some ~500MB with gzip. Might be worth a try.

talking about that I've just notice that --disable-dependency-tracking
was still building .d for c/cxx files

I pushed a fix...

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/platform/com_GCC_class.mk |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

New commits:
commit b1ad78d25c298e4f9b24ef7a761c9bba1f34c2ed
Author: Norbert Thiebaud 
Date:   Tue Jun 5 14:13:14 2012 -0500

Do not build c/cxx .d file when --disable-dependency-tracking

--disable-dependency-tracking is for build environment that
always do make clea + make to build
These do not need the dependency information and therefore
can save the expenses of tracking them.
the gc c/cxx compile command was using -MMD etc.. systematically.
this patch take gb_FULLDEPS value into account to avoid
-MMD when not necessary

Change-Id: Ic5c3c368c81da2b260a4fcdf03fdc01b45a9cb1f

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index b864ba4..478d5fd 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -20,6 +20,14 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+ifeq ($(gb_FULLDEPS),$(true))
+gb_ccx_dep_generation_options=-MMD -MT $(1) -MP -MF $(4)_
+gb_cxx_dep_copy=&& mv $(4)_ $(4)
+else
+gb_ccx_dep_generation_options=
+gb_cxx_dep_copy=
+endif
+
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s
@@ -54,11 +62,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
-   -MMD -MT $(1) \
-   -MP -MF $(4)_ \
+   $(gb_ccx_dep_generation_options) \
-I$(dir $(3)) \
-   $(INCLUDE) && \
-   mv $(4)_ $(4))
+   $(INCLUDE) \
+   $(gb_ccx_dep_copy) \
+   )
 endef
 
 # CxxObject class
@@ -75,11 +83,11 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-   -MMD -MT $(1) \
-   -MP -MF $(4)_ \
+   $(gb_ccx_dep_generation_options) \
-I$(dir $(3)) \
-   $(INCLUDE_STL) $(INCLUDE) && \
-   mv $(4)_ $(4))
+   $(INCLUDE_STL) $(INCLUDE) \
+   $(gb_ccx_dep_copy) \
+   )
 endef
 
 define gb_SrsPartTarget__command_dep
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Re: [PATCH] [REVIEW:3-5] fdo#47325 legacy reports from 3.4 or earlier fail to open

[Michael Stahl]

On 05/06/12 18:54, Lionel Elie Mamane wrote:
> Legacy reports (not Sun/Oracle Report Builder ones) created by
> LibreOffice 3.4 or earlier fail to open in LibreOffice 3.5 and later:
> show empty data.
> 
> That's because LibreOffice 3.5 expects a hidden control named
> "Sorting" to be present; but older versions did not create it.
> 
> Attached patch fixes that to cleanly catch the exception and act
> accordingly. Please apply to libreoffice-3-5 branch.

thanks, pushed to libreoffice-3-5

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/com

[Michael Stahl]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit bcf7425c7222e6c1e343c5e9a45d5fdf66dac53d
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b
(cherry picked from commit 3533328aae5f38d6d21c2baee782abc4511bb649)

Signed-off-by: Michael Stahl 

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = "";
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", 
sMsg);
 if (xNamedForm.hasByName("QueryName"))
 {
___
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 50386, which changed state.

Bug 50386 Summary: Page count field makes scrolling impossible
https://bugs.freedesktop.org/show_bug.cgi?id=50386

   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

[PUSHED] Re: [PATCH] Bug 50386 - Page count field makes scrolling impossible

[Michael Stahl]

On 04/06/12 20:39, Muhammad Haggag wrote:
> Hello.
> 
> = Bugs =
> https://bugs.freedesktop.org/show_bug.cgi?id=50386
> https://bugs.freedesktop.org/show_bug.cgi?id=50540
> 
> = Patch =
> https://bugs.freedesktop.org/attachment.cgi?id=62532

thanks a lot for investigating problems caused by your new feature, that
is much appreciated.

> = Change =
> This patch fixes a regression caused by my fix for fdo#34772 (adding
> word count to the status bar). The code used to count words was
> wrapped in StartAction/EndAction, which seem to be meant for input
> actions based on keyboard/mouse. EndAction calls UpdateCrsr with the
> SwCrsrShell::SCROLLWIN flag, resulting in the behavior described in
> fdo#50386 and fdo#50540.

yes, the shell Start/EndAction methods likely should only be used for
actual user actions; the intent there is to batch up changes so things
are only re-drawn once or something like that; there is also a different
start/end-action thing used by the UNO API implementation in
source/core/unocore that would leave the view cursor alone.

> We were calling it directly (Start/EndAction) and indirectly (through
> SwWrtShell::GetUpdatedDocStat). I removed the
> direct calls and replaced the SwWrtShell call with
> SwDoc::GetUpdatedDocStat, which doesn't call Start/EndAction.

for simply getting the document statistics no Start/EndAction of any
kind should be necessary because that doesn't change the document content.

hence i've pushed your patch to master and libreoffice-3-6.

> Can someone advise on whether we need the SwWait? It's there because I
> initially copied the code from wordcountdialog.cxx, but I'm not sure
> whether we actually need it (or need it to lock the dispatcher
> either).

i don't know what SwWait does... it seems it disables dispatching, and
calls VCL's Window::EnterWait/LeaveWait, and that causes the mouse
cursor to be changed into a wait-cursor (some kind of clock).

ah, it seems it causes the following odd behavior: new Writer document,
place the mouse cursor over the document area, it is a "line" cursor.
then type something. notice that few seconds later the word count in the
status bar is updated and simultaneously mouse cursor turns into an
arrow cursor.

so i've just pushed a commit to remove the SwWait line.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - sc/sdi sc/source vcl/inc vcl/source

[Kohei Yoshida]

 sc/sdi/docsh.sdi |   14 +++---
 sc/sdi/prevwsh.sdi   |3 +++
 sc/source/ui/app/scmod.cxx   |   31 +--
 sc/source/ui/docshell/docsh4.cxx |   13 +
 sc/source/ui/inc/prevwsh.hxx |3 +++
 sc/source/ui/view/prevwsh.cxx|   34 +-
 vcl/inc/vcl/syswin.hxx   |3 +++
 vcl/source/window/syswin.cxx |   11 +++
 vcl/source/window/winproc.cxx|   32 ++--
 9 files changed, 104 insertions(+), 40 deletions(-)

New commits:
commit 31ae782ea6aa69046272228867e6fc1239c7227c
Author: Kohei Yoshida 
Date:   Tue Jun 5 12:10:45 2012 -0400

Slightly cleaner way to get to the system window instance.

Change-Id: Ia75a70ff8cdb00db2c5b21825774fd5922992573

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index eb65065..1e556f0 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -114,7 +114,7 @@ void ScPreviewShell::Construct( Window* pParent )
 // Find the top-most window, and set the close window handler to intercept
 // the window close event.
 Window* pWin = pParent;
-while (true)
+while (!pWin->IsSystemWindow())
 {
 if (pWin->GetParent())
 pWin = pWin->GetParent();
@@ -122,7 +122,6 @@ void ScPreviewShell::Construct( Window* pParent )
 break;
 }
 
-pWin = pWin->GetWindow(WINDOW_CLIENT);
 mpFrameWindow = dynamic_cast(pWin);
 if (mpFrameWindow)
 mpFrameWindow->SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl));
commit 503dd9c1eda024ae57e49b5c63a1fc9e9eb6d1c1
Author: Kohei Yoshida 
Date:   Tue Jun 5 00:22:16 2012 -0400

Intercept the window close event and end the preview when clicking 'x'.

This is to prevent the preview window from closing the whole document
when pressing the window frame's 'x' button.  Instead, pressing the 'x'
will end the preview mode and bring it back to the normal Calc window.

Change-Id: If4d42928784e3e05bc6357d811a1954efb221f01

diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 0664c1e..0f89fc7 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -53,6 +53,7 @@ class ScPreviewShell: public SfxViewShell
 friend class ScPreview; // allow access to AdjustPosSizePixel
 ScDocShell* pDocShell;
 
+SystemWindow*   mpFrameWindow;
 ScPreview*  pPreview;   // Ausgabe-Fenster
 ScrollBar*  pHorScroll;
 ScrollBar*  pVerScroll;
@@ -69,7 +70,9 @@ friend class ScPreview; // allow access to AdjustPosSizePixel
 private:
 voidConstruct( Window* pParent );
 DECL_LINK(ScrollHandler, ScrollBar* );
+DECL_LINK(CloseHdl, SystemWindow*);
 voidDoScroll( sal_uInt16 nMode );
+void ExitPreview();
 
 protected:
 virtual voidActivate(sal_Bool bMDI);
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index c23c2f4..eb65065 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -111,6 +111,22 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" 
)
 
 void ScPreviewShell::Construct( Window* pParent )
 {
+// Find the top-most window, and set the close window handler to intercept
+// the window close event.
+Window* pWin = pParent;
+while (true)
+{
+if (pWin->GetParent())
+pWin = pWin->GetParent();
+else
+break;
+}
+
+pWin = pWin->GetWindow(WINDOW_CLIENT);
+mpFrameWindow = dynamic_cast(pWin);
+if (mpFrameWindow)
+mpFrameWindow->SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl));
+
 eZoom = SVX_ZOOM_WHOLEPAGE;
 
 pCorner = new ScrollBarBox( pParent, WB_SIZEABLE );
@@ -145,6 +161,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 SfxViewShell* pOldSh ) :
 SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ),
 pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ),
+mpFrameWindow(NULL),
 nSourceDesignMode( SC_FORCEMODE_NONE ),
 pAccessibilityBroadcaster( NULL )
 {
@@ -174,6 +191,9 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 
 ScPreviewShell::~ScPreviewShell()
 {
+if (mpFrameWindow)
+mpFrameWindow->SetCloseHdl(Link()); // Remove close handler.
+
 // #108333#; notify Accessibility that Shell is dying and before destroy 
all
 BroadcastAccessibility( SfxSimpleHint( SFX_HINT_DYING ) );
 DELETEZ(pAccessibilityBroadcaster);
@@ -502,6 +522,12 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* 
,pScroll )
 return 0;
 }
 
+IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*, EMPTYARG)
+{
+ExitPreview();
+return 0;
+}
+
 sal_Bool ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
 {
 sal_Bool bDone = false;
@@ -769,7 +795,7 @@ void ScPreviewShell::Execute( SfxR

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Michael Stahl]

 sw/source/ui/uiview/view2.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 265772797081d6d5b5cb94248a3a85d18487cd93
Author: Michael Stahl 
Date:   Tue Jun 5 20:09:54 2012 +0200

fdo#50386: SwView::StateStatusLine: remove SwWait:

This will turn the mouse cursor into an arrow cursor when the word count
is updated, which seems odd.

Change-Id: I136824a554cc31e302193cce58241cdf4e4dd281
(cherry picked from commit 78b61b4d944db7f00093d7ee250d234694f1d5b5)

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 73a8b96..b70670a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1204,7 +1204,6 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 SwDocStat selectionStats;
 SwDocStat documentStats;
 {
-SwWait aWait( *GetDocShell(), sal_True );
 rShell.CountWords(selectionStats);
 documentStats = rShell.GetDoc()->GetUpdatedDocStat();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Michael Stahl]

 sw/source/ui/uiview/view2.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 78b61b4d944db7f00093d7ee250d234694f1d5b5
Author: Michael Stahl 
Date:   Tue Jun 5 20:09:54 2012 +0200

fdo#50386: SwView::StateStatusLine: remove SwWait:

This will turn the mouse cursor into an arrow cursor when the word count
is updated, which seems odd.

Change-Id: I136824a554cc31e302193cce58241cdf4e4dd281

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 73a8b96..b70670a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1204,7 +1204,6 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 SwDocStat selectionStats;
 SwDocStat documentStats;
 {
-SwWait aWait( *GetDocShell(), sal_True );
 rShell.CountWords(selectionStats);
 documentStats = rShell.GetDoc()->GetUpdatedDocStat();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Michael Stahl]

 sw/source/ui/uiview/view2.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 59ea2faff4e938c77c71ec89bf9b6ea17a446cd1
Author: Muhammad Haggag 
Date:   Mon Jun 4 20:25:19 2012 +0200

fdo#50386 Page count field makes scrolling impossible

(Also fixes fdo#50540 View area jumps when start drawing)

The word count code for the status bar was calling EndAction, which scrolls 
the view to focus on the cursor.
We were calling it directly (Start/EndAction) and indirectly (through 
SwWrtShell::GetUpdatedDocStat). I removed the
direct calls and replaced the SwWrtShell call with 
SwDoc::GetUpdatedDocStat, which doesn't call Start/EndAction.

Change-Id: I764e8c2d9c10f8eb685d36d0e26142cf3fee628c
(cherry picked from commit a8080cad1089431a2d97903f73623eabe2eb23a7)

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 58b5ce4..73a8b96 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1205,10 +1205,8 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 SwDocStat documentStats;
 {
 SwWait aWait( *GetDocShell(), sal_True );
-rShell.StartAction();
 rShell.CountWords(selectionStats);
-documentStats = rShell.GetUpdatedDocStat();
-rShell.EndAction();
+documentStats = rShell.GetDoc()->GetUpdatedDocStat();
 }
 
 const sal_uInt32 stringId = selectionStats.nWord? 
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Michael Stahl]

 sw/source/ui/uiview/view2.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a8080cad1089431a2d97903f73623eabe2eb23a7
Author: Muhammad Haggag 
Date:   Mon Jun 4 20:25:19 2012 +0200

fdo#50386 Page count field makes scrolling impossible

(Also fixes fdo#50540 View area jumps when start drawing)

The word count code for the status bar was calling EndAction, which scrolls 
the view to focus on the cursor.
We were calling it directly (Start/EndAction) and indirectly (through 
SwWrtShell::GetUpdatedDocStat). I removed the
direct calls and replaced the SwWrtShell call with 
SwDoc::GetUpdatedDocStat, which doesn't call Start/EndAction.

Change-Id: I764e8c2d9c10f8eb685d36d0e26142cf3fee628c

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 58b5ce4..73a8b96 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1205,10 +1205,8 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 SwDocStat documentStats;
 {
 SwWait aWait( *GetDocShell(), sal_True );
-rShell.StartAction();
 rShell.CountWords(selectionStats);
-documentStats = rShell.GetUpdatedDocStat();
-rShell.EndAction();
+documentStats = rShell.GetDoc()->GetUpdatedDocStat();
 }
 
 const sal_uInt32 stringId = selectionStats.nWord? 
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] [PYTHON] DialogBox class for Python

[Joost Eekhoorn]

>>   I could not found a dialogbox class, thus I build one: class DialogBox
in dialogbox.py.

I did not look good enough.
There is UnoDialog2.py in wizards/com/sun/star/wizards/ui.

Thus dialogbox.py can go to /dev/null.
Also the 2 examples.

I made a new example using UnoDialog2: example-using-unodialog2.py.

>>  The header would have to be changed to the TEMPLATE.SOURCECODE.HEADER

The attached new example has this header.

>>  Would the idea be to install it along with the rest of pyuno as
>>  utility class for reuse.

Do not install dialogbox.py, because its is redundant.
Just to be thrown away.

>>  or to just have it as a demo ?

As a demo would be nice.
Therefor a code review is needed and a demo context.
Where is the place for such a demo ?

Joost


example-using-unodialog2.py
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] [REVIEW:3-5] fdo#47325 legacy reports from 3.4 or earlier fail to open

[Lionel Elie Mamane]

Legacy reports (not Sun/Oracle Report Builder ones) created by
LibreOffice 3.4 or earlier fail to open in LibreOffice 3.5 and later:
show empty data.

That's because LibreOffice 3.5 expects a hidden control named
"Sorting" to be present; but older versions did not create it.

Attached patch fixes that to cleanly catch the exception and act
accordingly. Please apply to libreoffice-3-5 branch.

-- 
Lionel
>From 3533328aae5f38d6d21c2baee782abc4511bb649 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane 
Date: Tue, 5 Jun 2012 18:40:13 +0200
Subject: [PATCH] fdo#47325 legacy reports: survive absence of Sorting hidden
 control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b
---
 .../wizards/report/ReportTextImplementation.java   |   11 ++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 String sCommandType = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", sMsg);
 String sFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
-final String sorting = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+String sorting;
+try
+{
+sorting = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+		sorting = "";
+}
 String sRecordFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", sMsg);
 if (xNamedForm.hasByName("QueryName"))
 {
-- 
1.7.7.3

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] Changes to 'features/base-preview'

[Lionel Elie Mamane]

New branch 'features/base-preview' available with the following commits:
commit 3533328aae5f38d6d21c2baee782abc4511bb649
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

commit 73680e97aafcb05e118fa8801e61590f10ea30b1
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

 - Data must be fetched in increasing order of column number
   (again, this is about SQLGetData).

   This is a harder issue. The current solution has the nice advantage
   of completely isolating the rest of LibO from these restrictions.

   I don't currently see how to cleanly avoid (potentially
   unnecessarily) caching column 4 if we are asked for column 3 then
   column 5, just in case we are asked for column 4 later on, unless
   we issue a specific "SELECT column4" later. But the latter would be
   quite expensive in terms of app-to-database roudtripe times :-( and
   thus creates another performance issue.

Change-Id: I999b3f8f0b8a215acb390ffefc839235346e8353

commit c1c169176faa2e624e6289b0c0df4bc2817866a9
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:41:33 2012 +0200

Need to refresh row after moving to bookmark!

Change-Id: Ia8d12d02829087309e248506a7d3b0f94b5a425e

commit 825630579ecc2a541820d2e8676c80d715fa4331
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:40:30 2012 +0200

Cleanup m_xSet in destructor

Change-Id: I3d7023fcb1857da1ef107a8af0d373b9ca464f03

commit 5eff5f9290cb4123a39f8289be22cb934261d162
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:35:52 2012 +0200

typos in comments

Change-Id: I1dbb1990033602d7909ecdee72b8b699cce44cab

commit 4caae0496de42bad16e452e2ecbb749eea26a9f9
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:31:25 2012 +0200

Remove wrong optimisation

fixup of d4ae29a37873843c20fe7d5f5f071f8fb201fed9
after the call to m_pCacheSet->absolute_checked, the data *is* used,
so we cannot anymore exempt m

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

[Lionel Elie Mamane]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 3ec6e1378545b5d5071531d1f6de259ac9028176
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = "";
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", 
sMsg);
 if (xNamedForm.hasByName("QueryName"))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 58c716d6ef550c056cc19b75f109983e661b9246
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = "";
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", 
sMsg);
 if (xNamedForm.hasByName("QueryName"))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'features/base-preview' - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a2f02b854f709719725cc1faba3881f727b8133d
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = "";
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", 
sMsg);
 if (xNamedForm.hasByName("QueryName"))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-ux-advise] Disabling file opening and saving in print preview mode

[Rainer Bielefeld]

Stefan Knorr (Astron) schrieb:



might it be worth thinking about just removing the
separate print preview feature and making the print preview inside the
dialogue a little bigger?


Hi,

better not before we have such a (PDF) Export Preview.

But of course, advantage with this page preview excluding solution is 
that it saves much work with Page Preview cleanup (lots of menus 
containing only disabled items, Find bar appears after  
without function, ...


I don't know how many users use the Page settings possibility in Page 
preview (Regina Henschel broght up this point).


Best regards

Rainer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - sc/sdi sc/source vcl/inc vcl/source

[Kohei Yoshida]

 sc/sdi/docsh.sdi |   14 +++---
 sc/sdi/prevwsh.sdi   |3 +++
 sc/source/ui/app/scmod.cxx   |   31 +--
 sc/source/ui/docshell/docsh4.cxx |   13 +
 sc/source/ui/inc/prevwsh.hxx |3 +++
 sc/source/ui/view/prevwsh.cxx|   34 +-
 vcl/inc/vcl/syswin.hxx   |3 +++
 vcl/source/window/syswin.cxx |   11 +++
 vcl/source/window/winproc.cxx|   32 ++--
 9 files changed, 104 insertions(+), 40 deletions(-)

New commits:
commit c379b5b82e1ce693b5dc158dcea0f8b0a508ea46
Author: Kohei Yoshida 
Date:   Tue Jun 5 12:10:45 2012 -0400

Slightly cleaner way to get to the system window instance.

Change-Id: Ia75a70ff8cdb00db2c5b21825774fd5922992573

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index eb65065..1e556f0 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -114,7 +114,7 @@ void ScPreviewShell::Construct( Window* pParent )
 // Find the top-most window, and set the close window handler to intercept
 // the window close event.
 Window* pWin = pParent;
-while (true)
+while (!pWin->IsSystemWindow())
 {
 if (pWin->GetParent())
 pWin = pWin->GetParent();
@@ -122,7 +122,6 @@ void ScPreviewShell::Construct( Window* pParent )
 break;
 }
 
-pWin = pWin->GetWindow(WINDOW_CLIENT);
 mpFrameWindow = dynamic_cast(pWin);
 if (mpFrameWindow)
 mpFrameWindow->SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl));
commit 80fb93fe6c08f25a404ff2afa989fca246ac9efd
Author: Kohei Yoshida 
Date:   Tue Jun 5 00:22:16 2012 -0400

Intercept the window close event and end the preview when clicking 'x'.

This is to prevent the preview window from closing the whole document
when pressing the window frame's 'x' button.  Instead, pressing the 'x'
will end the preview mode and bring it back to the normal Calc window.

Change-Id: If4d42928784e3e05bc6357d811a1954efb221f01

diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 0664c1e..0f89fc7 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -53,6 +53,7 @@ class ScPreviewShell: public SfxViewShell
 friend class ScPreview; // allow access to AdjustPosSizePixel
 ScDocShell* pDocShell;
 
+SystemWindow*   mpFrameWindow;
 ScPreview*  pPreview;   // Ausgabe-Fenster
 ScrollBar*  pHorScroll;
 ScrollBar*  pVerScroll;
@@ -69,7 +70,9 @@ friend class ScPreview; // allow access to AdjustPosSizePixel
 private:
 voidConstruct( Window* pParent );
 DECL_LINK(ScrollHandler, ScrollBar* );
+DECL_LINK(CloseHdl, SystemWindow*);
 voidDoScroll( sal_uInt16 nMode );
+void ExitPreview();
 
 protected:
 virtual voidActivate(sal_Bool bMDI);
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index c23c2f4..eb65065 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -111,6 +111,22 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" 
)
 
 void ScPreviewShell::Construct( Window* pParent )
 {
+// Find the top-most window, and set the close window handler to intercept
+// the window close event.
+Window* pWin = pParent;
+while (true)
+{
+if (pWin->GetParent())
+pWin = pWin->GetParent();
+else
+break;
+}
+
+pWin = pWin->GetWindow(WINDOW_CLIENT);
+mpFrameWindow = dynamic_cast(pWin);
+if (mpFrameWindow)
+mpFrameWindow->SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl));
+
 eZoom = SVX_ZOOM_WHOLEPAGE;
 
 pCorner = new ScrollBarBox( pParent, WB_SIZEABLE );
@@ -145,6 +161,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 SfxViewShell* pOldSh ) :
 SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ),
 pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ),
+mpFrameWindow(NULL),
 nSourceDesignMode( SC_FORCEMODE_NONE ),
 pAccessibilityBroadcaster( NULL )
 {
@@ -174,6 +191,9 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 
 ScPreviewShell::~ScPreviewShell()
 {
+if (mpFrameWindow)
+mpFrameWindow->SetCloseHdl(Link()); // Remove close handler.
+
 // #108333#; notify Accessibility that Shell is dying and before destroy 
all
 BroadcastAccessibility( SfxSimpleHint( SFX_HINT_DYING ) );
 DELETEZ(pAccessibilityBroadcaster);
@@ -502,6 +522,12 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* 
,pScroll )
 return 0;
 }
 
+IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*, EMPTYARG)
+{
+ExitPreview();
+return 0;
+}
+
 sal_Bool ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
 {
 sal_Bool bDone = false;
@@ -769,7 +795,7 @@ void ScPreviewShell::Execute( SfxR

[Libreoffice-commits] .: autodoc/source chart2/source codemaker/source connectivity/source UnoControls/source

[Takeshi Abe]

 UnoControls/source/base/basecontainercontrol.cxx   |   10 ---
 UnoControls/source/controls/framecontrol.cxx   |   22 ---
 autodoc/source/parser_i/idoc/cx_dsapi.cxx  |7 -
 chart2/source/tools/NameContainer.cxx  |4 --
 chart2/source/view/charttypes/AreaChart.cxx|   14 --
 chart2/source/view/charttypes/CandleStickChart.cxx |   15 --
 chart2/source/view/inc/PlottingPositionHelper.hxx  |8 -
 codemaker/source/cppumaker/cpputype.cxx|   29 -
 connectivity/source/drivers/mozab/MTables.cxx  |5 ---
 connectivity/source/drivers/mysql/YTables.cxx  |   12 
 10 files changed, 126 deletions(-)

New commits:
commit f7ebee38a3c5c6cb58f40109a213d449138ea987
Author: Takeshi Abe 
Date:   Tue Jun 5 22:59:19 2012 +0900

removed dead code

Change-Id: I02e535f0a0e55446e5a29297c2d05b1503805e71

diff --git a/UnoControls/source/base/basecontainercontrol.cxx 
b/UnoControls/source/base/basecontainercontrol.cxx
index f219b3f..02a0f53 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -575,16 +575,6 @@ WindowDescriptor* 
BaseContainerControl::impl_getWindowDescriptor ( const Referen
 
 void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, 
const Reference< XGraphics > & /*rGraphics*/ )
 {
-/*
-if (rGraphics.is())
-{
-for ( size_t n = maControlInfoList.size(); n; )
-{
-ControlInfo* pSearchControl = maControlInfoList[ --n ];
-pSearchControl->xControl->paint ( nX, nY, rGraphics ) ;
-}
-}
-*/
 }
 
 
//
diff --git a/UnoControls/source/controls/framecontrol.cxx 
b/UnoControls/source/controls/framecontrol.cxx
index 49f3ed8..0504a11 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -426,28 +426,6 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
 
 return *pInfo ;
 }
-/*
-//--
-// start OConnectionPointContainerHelper
-//--
-Uik* FrameControl::getConnectionPointUiks ( sal_Int32* pCount ) const
-{
-static Uik szUiks[] =
-{
-((XEventListener*)NULL)->getSmartUik  (),
-::getCppuType((const Reference< XPropertyChangeListener >*)0),
-::getCppuType((const Reference< XVetoableChangeListener >*)0),
-::getCppuType((const Reference< XPropertiesChangeListener >*)0)
-} ;
-
-*pCount = 4 ;
-
-return szUiks ;
-}
-//--
-// end OConnectionPointContainerHelper
-//--
-*/
 
 
//
 //  OPropertySetHelper
diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx 
b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
index 662af48..21b8595 100644
--- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx
+++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
@@ -305,13 +305,6 @@ Context_Docu::SetupStateMachine()
 
 // constants for use in the table:
 const INT16 ght = goto_EoHtml;
-/*
-const INT16 gxc = goto_EoXmlConst;
-const INT16 glb = goto_EoXmlLink_TagBegin;
-const INT16 gle = goto_EoXmlLink_TagEnd;
-const INT16 gfb = goto_EoXmlFormat_TagBegin;
-const INT16 gfe = goto_EoXmlFormat_TagEnd;
-*/
 const INT16 err = finError;
 const INT16 faw = finAnyWord;
 //  const INT16 fig = finIgnore;
diff --git a/chart2/source/tools/NameContainer.cxx 
b/chart2/source/tools/NameContainer.cxx
index a0d2a4f..52bf75e 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -29,10 +29,6 @@
 
 #include "NameContainer.hxx"
 
-/*
-//SvXMLUnitConverter
-#include 
-*/
 #include 
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/view/charttypes/AreaChart.cxx 
b/chart2/source/view/charttypes/AreaChart.cxx
index bcc2456..0d8b299 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -168,20 +168,6 @@ uno::Any AreaChart::getExplicitSymbol( const VDataSeries& 
rSeries, sal_Int32 nPo
 return aRet;
 }
 
-//-
-// lang::XServiceInfo
-//-
-/*
-APPHELPER_XSERVICEINFO_IMPL(AreaChart,CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME)
-
-uno::Sequence< rtl::OUString > AreaChart
-::getSupportedServiceNames_Static()
-{
-uno::Sequence< rtl::OUString > aSN

Re: [PUSHED] Re: [PATCH 2/2] Smarter auto-complete capitalization (#i22961#) and i18n handling

[Caolán McNamara]

On Mon, 2012-06-04 at 22:44 +0200, Michael Stahl wrote:
> On 04/06/12 14:03, Brad Sowden wrote:
> > * Sidenote - Initially I tried using CharClass::titlecase() but 
> > discovered this doesn't actually work. 

What did you try and what went wrong ?

> > There appears to be an issue with 
> > class cclass_Unicode where "trans" is only ever set to 
> > "Transliteration_casemapping" and there is no mechanism to set it to 
> > "Transliteration_titlecase".

I believe that the casemapping thing there knows about upper, lower and
title case and uses setMappingType to MappingTypeToTitle to toggle which
one to return

e.g. I added this test
http://cgit.freedesktop.org/libreoffice/core/commit/?id=eb9b8ebca49291797e655b50f64af2c2fa03434c
to confirm to myself that its working like I think its supposed to.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_characterclassification.mk i18npool/Module_i18npool.mk i18npool/qa

[Caolán McNamara]

 i18npool/CppunitTest_i18npool_test_characterclassification.mk |   54 
 i18npool/Module_i18npool.mk   |1 
 i18npool/qa/cppunit/test_characterclassification.cxx  |  110 ++
 3 files changed, 165 insertions(+)

New commits:
commit eb9b8ebca49291797e655b50f64af2c2fa03434c
Author: Caolán McNamara 
Date:   Tue Jun 5 16:43:55 2012 +0100

add a titlecase regression test

Change-Id: Ic802fc816d54b97b333e3b2bc394beb383f3e5ef

diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk 
b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
new file mode 100644
index 000..b4e0a81
--- /dev/null
+++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Matúš Kukan 
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call 
gb_CppunitTest_CppunitTest,i18npool_test_characterclassification))
+
+$(eval $(call gb_CppunitTest_use_api,i18npool_test_characterclassification,\
+   udkapi \
+   offapi \
+))
+
+$(eval $(call 
gb_CppunitTest_use_libraries,i18npool_test_characterclassification,\
+   cppu \
+   cppuhelper \
+   sal \
+   unotest \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call 
gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\
+i18npool/qa/cppunit/test_characterclassification \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,i18npool_test_characterclassification))
+
+$(eval $(call 
gb_CppunitTest_use_components,i18npool_test_characterclassification,\
+   i18npool/util/i18npool \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index a2aee88..bed175a 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -62,6 +62,7 @@ endif
 
 $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
+   CppunitTest_i18npool_test_characterclassification \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx 
b/i18npool/qa/cppunit/test_characterclassification.cxx
new file mode 100644
index 000..08c2029
--- /dev/null
+++ b/i18npool/qa/cppunit/test_characterclassification.cxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *   Caolán McNamara 
+ *
+ * Contributor(s):
+ *   Caolán McNamara 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+using namespace ::com::sun::star;
+
+class TestCharacterClassification : public test::BootstrapFixtureBase
+{
+public:
+virtual void setUp();
+virtual void tearDown();
+
+void testTitleCase();
+
+CPPUNIT_TEST_SUITE(TestCharacterClassification);
+CPPUNIT_TEST(testTitleCase);
+CPPUNIT_TEST

[REVIEW-3-5] fdo#47805 rework handling of 64-bit registry entries

[Andras Timar]

Hi,

This is a big patch, but I think the logic is simple. It makes Windows
shell extensions work out of the box on 64-bit Windows. Instead of a
(non-working) hack with Reg64 table and 4 registry manipulating custom
actions, we use normal MSI actions to set the appropriate registry
keys during install and remove them during uninstall.

On the other hand, the resulting MSI database fails the ICE80 test,
because it associates a 64-bit registry item to a 32-bit directory
(WTF?), and installs 64-bit elements from a 32-bit installer. But in
real life it seems to be OK, installer does what it has to do (and
what I wanted). I tested it on Windows 7 32/64 bit, and Windows 2008
Server R2.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6d9be05a6fb251ed0cbcbcefd55ed174b1e8e39d

Please let me know, if you want this in libreoffice-3-5. I did not
try, maybe it does not apply cleanly, but I can backport.

Thanks,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - sc/inc sc/source unusedcode.easy vcl/inc vcl/Library_vclplug_gen.mk vcl/unx

[Thomas Arnhold]

 sc/inc/chartlis.hxx |1 
 sc/inc/pivot.hxx|1 
 sc/inc/rangenam.hxx |2 
 sc/source/core/data/pivot2.cxx  |   13 -
 sc/source/core/tool/chartlis.cxx|8 
 sc/source/core/tool/rangenam.cxx|   32 ---
 unusedcode.easy |4 
 vcl/Library_vclplug_gen.mk  |1 
 vcl/inc/unx/saldisp.hxx |9 
 vcl/unx/generic/app/keysymnames.cxx |  366 
 vcl/unx/generic/app/saldisp.cxx |   21 +-
 11 files changed, 390 insertions(+), 68 deletions(-)

New commits:
commit eb4001a2659ff1fcc941d8c0b439da65408183be
Author: Thomas Arnhold 
Date:   Tue Jun 5 17:47:17 2012 +0200

unusedcode.easy: remove some unused code

Change-Id: I0b9abff3978c03c87aa0d49dbfb531ec4f38d698

diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 8ca2760..2dff0c2 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -95,7 +95,6 @@ public:
 ~ScChartListener();
 
 const rtl::OUString& GetName() const;
-void SetName(const rtl::OUString& rName);
 
 voidSetUno( const com::sun::star::uno::Reference< 
com::sun::star::chart::XChartDataChangeEventListener >& rListener,
 const com::sun::star::uno::Reference< 
com::sun::star::chart::XChartData >& rSource );
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 27f3dbc..34fc22a 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -163,7 +163,6 @@ struct ScDPLabelData
 ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo; /// 
AutoShow info.
 
 ScDPLabelData();
-explicit ScDPLabelData(const rtl::OUString& rName, SCCOL nCol, bool 
bIsValue);
 
 /**
  * return the name that should be displayed in the dp dialogs i.e. when
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index dfb7d9e..4e96063 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -86,8 +86,6 @@ private:
 SCROW   mnMaxRow;
 SCCOL   mnMaxCol;
 
-ScRangeData( sal_uInt16 nIndex );
-
 void CompileRangeData( const String& rSymbol, bool bSetError );
 
 public:
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 2992023..1b60ae0 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -103,19 +103,6 @@ ScDPLabelData::ScDPLabelData() :
 {
 }
 
-ScDPLabelData::ScDPLabelData(const rtl::OUString& rName, SCCOL nCol, bool 
bIsValue) :
-maName( rName ),
-mnCol( nCol ),
-mnOriginalDim(-1),
-mnFuncMask( PIVOT_FUNC_NONE ),
-mnUsedHier( 0 ),
-mnFlags( 0 ),
-mbShowAll( false ),
-mbIsValue( bIsValue ),
-mbDataLayout(false)
-{
-}
-
 OUString ScDPLabelData::getDisplayName() const
 {
 if (!maLayoutName.isEmpty())
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index d49fdeb..d749f63 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -26,9 +26,6 @@
  *
  /
 
-
-
-
 #include 
 
 #include "chartlis.hxx"
@@ -200,11 +197,6 @@ const rtl::OUString& ScChartListener::GetName() const
 return maName;
 }
 
-void ScChartListener::SetName(const rtl::OUString& rName)
-{
-maName = rName;
-}
-
 void ScChartListener::SetUno(
 const uno::Reference< chart::XChartDataChangeEventListener >& 
rListener,
 const uno::Reference< chart::XChartData >& rSource )
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index e671585..f6c3af4 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -55,12 +55,6 @@ using ::rtl::OUString;
 // ScRangeData
 //
 
-// Interner ctor fuer das Suchen nach einem Index
-
-ScRangeData::ScRangeData( sal_uInt16 n )
-   : pCode( NULL ), nIndex( n ), bModified( false ), mnMaxRow(-1), 
mnMaxCol(-1)
-{}
-
 ScRangeData::ScRangeData( ScDocument* pDok,
   const rtl::OUString& rName,
   const String& rSymbol,
@@ -596,32 +590,6 @@ sal_uInt32 ScRangeData::GetUnoType() const
 return nUnoType;
 }
 
-void ScRangeData::ReplaceRangeNamesInUse( const IndexMap& rMap )
-{
-bool bCompile = false;
-for ( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
-{
-if ( p->GetOpCode() == ocName )
-{
-const sal_uInt16 nOldIndex = p->GetIndex();
-IndexMap::const_iterator itr = rMap.find(nOldIndex);
-const sal_uInt16 nNewIndex = itr == rMap.end() ? nOldIndex : 
itr->second;
-if ( nOldIndex != nNewIndex )
-{
-p->SetIndex( nNewIndex );
-bCompile = true;
-}
-}
-}
-if ( bCompile )
-{
-ScCompiler aComp( pDoc, aPos, *pCode);
-aComp.SetGrammar(pDoc->GetGrammar());
-aCo

[Libreoffice-commits] .: oox/inc sc/source

[Noel Power]

 oox/inc/oox/core/fragmenthandler2.hxx  |3 +--
 sc/source/filter/oox/worksheetfragment.cxx |4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit afbb2d8f7d72292532a9ea54fa2e6757b6d548c2
Author: Noel Power 
Date:   Tue Jun 5 16:41:53 2012 +0100

fix missing ole and form control(s) on xlsx import

chang the visibility of aMceState in order to access that member to filter 
out reading and parsing of ./xl/ctrlProps/ctrlProp[N].xml fragments for 
'controls' & 'oleObjects' elements nested withing 'mc:AlternateContent' elements

Change-Id: I6892db7e3302b9977f0fdaabbe3ac1444315e011

diff --git a/oox/inc/oox/core/fragmenthandler2.hxx 
b/oox/inc/oox/core/fragmenthandler2.hxx
index 781ed85..70ded85 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -41,7 +41,7 @@ namespace core {
 
 class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public 
ContextHandler2Helper
 {
-private:
+protected:
 enum MCE_STATE
 {
 MCE_UNUSED,
@@ -50,7 +50,6 @@ private:
 };
 ::std::vector   aMceState;
 
-private:
 boolprepareMceContext( sal_Int32 nElement, const 
AttributeList& rAttribs );
 
 
diff --git a/sc/source/filter/oox/worksheetfragment.cxx 
b/sc/source/filter/oox/worksheetfragment.cxx
index be41a16..8616305 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -332,10 +332,10 @@ ContextHandlerRef WorksheetFragment::onCreateContext( 
sal_Int32 nElement, const
 break;
 
 case XLS_TOKEN( oleObjects ):
-if( nElement == XLS_TOKEN( oleObject ) ) importOleObject( rAttribs 
);
+if( nElement == XLS_TOKEN( oleObject ) && aMceState.empty() ) 
importOleObject( rAttribs );
 break;
 case XLS_TOKEN( controls ):
-if( nElement == XLS_TOKEN( control ) ) importControl( rAttribs );
+if( nElement == XLS_TOKEN( control ) && aMceState.empty() ) 
importControl( rAttribs );
 break;
 }
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-5] Bug 43989 - After installation first launch terminates after splash screen

[Andras Timar]

Hi,

Please read comments in the bug from
https://bugs.freedesktop.org/show_bug.cgi?id=43989#c29 and the commit
message.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8783ead70cc2bc2a83bf473b0dfb51f3ee10b6da

It was a MAB, please review and cherry-pick to libreoffice-3-5.

Thanks,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 43989, which changed state.

Bug 43989 Summary: After installation first launch terminates after splash 
screen
https://bugs.freedesktop.org/show_bug.cgi?id=43989

   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

[REVIEW][3-5] fdo#33634, fdo#49438 border line drawing regressions

[Michael Stahl]

drawing of borders in Calc looks rather ugly, the lines suddenly getting
much fatter when zooming in etc., and there's a fix for that by moggi,
mostly doing arithmetic on doubles and changing the hairline predicate
from something that is right for Writer to something that is right (or
at least not as wrong) for Calc:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=2c91cb08d65cd35fa8ef6eaca3677aa82fb58cbe

this fix unfortunately introduces a regression that thin lines become
invisible when anti-aliasing is disabled, and i've come up with this
horrible hack that seems to fix it for me:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=ee42895d684be9430a414adf3f569d279d437148

so i'd say we should backport both of these to libreoffice-3-5.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/qa

[Miklos Vajna]

 sw/qa/extras/ooxmltok/data/smartart.docx |binary
 sw/qa/extras/ooxmltok/ooxmltok.cxx   |   29 +
 2 files changed, 29 insertions(+)

New commits:
commit 67a041cf75c2d21de2ab59ef2ea0e0c612943ebd
Author: Miklos Vajna 
Date:   Tue Jun 5 17:21:54 2012 +0200

sw: add smartart import testcase

Change-Id: I6a120fc69036fef8f21a2f80a2f424f36f876d23

diff --git a/sw/qa/extras/ooxmltok/data/smartart.docx 
b/sw/qa/extras/ooxmltok/data/smartart.docx
new file mode 100644
index 000..7a553f4
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/smartart.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 6dd7927..2b050eb 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -63,6 +64,7 @@ public:
 void testN652364();
 void testN760764();
 void testN764005();
+void testSmartart();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -80,6 +82,7 @@ public:
 CPPUNIT_TEST(testN652364);
 CPPUNIT_TEST(testN760764);
 CPPUNIT_TEST(testN764005);
+CPPUNIT_TEST(testSmartart);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -443,6 +446,32 @@ void Test::testN764005()
 CPPUNIT_ASSERT_EQUAL(sal_False, bValue);
 }
 
+void Test::testSmartart()
+{
+load("smartart.docx");
+
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws->getCount()); // One groupshape 
in the doc
+
+uno::Reference xGroup(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xGroup->getCount()); // 3 rectangles 
and an arrow in the group
+
+uno::Reference xPropertySet(xGroup->getByIndex(1), 
uno::UNO_QUERY);
+sal_Int32 nValue(0);
+xPropertySet->getPropertyValue("FillColor") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), nValue); // If fill color is 
right, theme import is OK
+
+uno::Reference xTextRange(xGroup->getByIndex(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Sample"), xTextRange->getString()); // 
Shape has text
+
+uno::Reference 
xParaEnumAccess(xTextRange->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPropertySet->getPropertyValue("ParaAdjust") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(style::ParagraphAdjust_CENTER), nValue); // 
Paragraph properties are imported
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Disabling file opening and saving in print preview mode

[Kohei Yoshida]

On 05/31/2012 10:13 PM, Kohei Yoshida wrote:

On Thu, 2012-05-31 at 19:04 +0200, Stefan Knorr (Astron) wrote:

→ reply to list, too

Hi Kohei,


I noticed that we actually allow saving and loading of document in print
preview mode.  But to me that feels very odd.


What sticks out as most odd to me is that our print preview is so
incredibly cluttered (menu bar + 2 toolbars), whereas e.g. in Firefox
it is very focused (just a toolbar).
So, yes, I do agree with this, in general, just the Print Preview
toolbar should be enough.


Actually (thinking about this again), given the way our current preview
window is implemented, this (i.e. remove the menu bar and the top tool
bar, and only leave the preview toolbar and disable a bunch of other
things) is probably the best we can offer.  Anything else we try to do
would end up causing lots of odd behaviors in many corners, such as bug
fdo#48348.


Some updates.

For 3.6, I will just disable a bunch of commands including the file open 
and save, intercept the window close event so that clicking the 'x' 
button on the title bar ends the preview and moves back to the main Calc 
window, and disable the close command to avoid closing the window via 
File - Close and Ctrl-W.  The reason for disabling the close commands 
rather than intercepting them and translating them to just end the 
preview mode is because it's technically very difficult to do so because 
of the way we end the preview shell.  I won't go into the detail here.


Also, for 3.6, I'll leave the menu bar and the tool bars alone, because 
(again), it won't be easy to change this without doing massive rework.


Now, I'm almost done, except for the disabling of the close commands. 
Normally, we can disable commands by simply handling their respective 
state handler callbacks, but for the close commands (i.e. 
".uno:CloseDoc" and ".uno:CloseWin") it's not that simple.  This is 
because we need to show the start center pane when the last app window 
closes.  The framework code handles these commands in a special way. 
And currently, the Close commands are always enabled no matter what, and 
there is no systematic way to disable them (that I know of).


I'm still trying to figure out how to optionally disable them in a clean 
way, but I may not be able to do this before I leave for my vacation. 
So, I might just push what I've done so far, and tackle the issue of 
disabling the Close commands later.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 05cc8975d17b2f2c00e794252c34dc12394abc62
Author: Tor Lillqvist 
Date:   Tue Jun 5 18:01:43 2012 +0300

PATH for cross-compilations was broken in some way, this seems to fix it

Change-Id: Ifa82be2dfae383ed8570c1d99584e67d85833612

diff --git a/configure.in b/configure.in
index bb3eed0..8f74557 100644
--- a/configure.in
+++ b/configure.in
@@ -3555,7 +3555,7 @@ if test "$cross_compiling" = "yes"; then
 fi
 done
 
-for V in OUTDIR LO_PATH SOLARINC SOLARLIB WORKDIR; do
+for V in OUTDIR SOLARINC SOLARLIB WORKDIR; do
 VV='$'$V
 VV=`eval "echo $VV"`
 VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -3564,6 +3564,10 @@ if test "$cross_compiling" = "yes"; then
 echo "$line" >>build-config
 fi
 done
+
+line=`echo "LO_PATH_FOR_BUILD=$PATH" | sed -e 's,/CONF-FOR-BUILD,,g'`
+echo "$line" >>build-config
+
 )
 test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure 
script for BUILD system failed, see CONF-FOR-BUILD/config.log])
 test -f config_build.mk || AC_MSG_ERROR([A file called config_build.mk was 
supposed to have been copied here, but it isn't found])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - scp2/source

[Andras Timar]

 scp2/source/ooo/windowscustomaction_ooo.scp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b33f69d2f45d92fd84cdff73d8baee0b14b40791
Author: Andras Timar 
Date:   Tue Jun 5 16:57:53 2012 +0200

fdo#43989 let unopkg.exe run with elevated privileges during install

... so it can do the pre-registration of bundled extensions in
INSTALLLOCATION/share/prereg/bundle.
The meaning of Type of custom action is the following:
msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData +
msidbCustomActionTypeInScript + msidbCustomActionTypeNoImpersonate +
msidbCustomActionTypeCommit = 3585
So it is a binary in a dll from the MSI itself, it runs deferred
with system privileges and after commit, because msvcrt90.dll is
available only after commit. The same type was chosen for the
removing part, it works.

Change-Id: I14c347b5cbc47789eb0484769a676703361c2193

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 077cd6e..2fdae2c 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -178,21 +178,21 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
Name = "RegisterExtensions";
-   Typ = "1";
+   Typ = "3585";
Source = "shlxtmsi.dll";
Target = "RegisterExtensions";
Inbinarytable = 1;
-   Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", 
"behind_InstallFinalize");
-   Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", 
"behind_InstallFinalize");
+   Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", 
"InstallFinalize");
+   Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", 
"InstallFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions
Name = "RemoveExtensions";
-   Typ = "65";
+   Typ = "3585";
Source = "shlxtmsi.dll";
Target = "RemoveExtensions";
Inbinarytable = 1;
-   Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not 
PATCH", "FileCost");
+   Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not 
PATCH", "InstallFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Set_Admininstall
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/ooo/windowscustomaction_ooo.scp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8783ead70cc2bc2a83bf473b0dfb51f3ee10b6da
Author: Andras Timar 
Date:   Tue Jun 5 16:57:53 2012 +0200

fdo#43989 let unopkg.exe run with elevated privileges during install

... so it can do the pre-registration of bundled extensions in
INSTALLLOCATION/share/prereg/bundle.
The meaning of Type of custom action is the following:
msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData +
msidbCustomActionTypeInScript + msidbCustomActionTypeNoImpersonate +
msidbCustomActionTypeCommit = 3585
So it is a binary in a dll from the MSI itself, it runs deferred
with system privileges and after commit, because msvcrt90.dll is
available only after commit. The same type was chosen for the
removing part, it works.

Change-Id: I14c347b5cbc47789eb0484769a676703361c2193

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 077cd6e..2fdae2c 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -178,21 +178,21 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
Name = "RegisterExtensions";
-   Typ = "1";
+   Typ = "3585";
Source = "shlxtmsi.dll";
Target = "RegisterExtensions";
Inbinarytable = 1;
-   Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", 
"behind_InstallFinalize");
-   Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", 
"behind_InstallFinalize");
+   Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", 
"InstallFinalize");
+   Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", 
"InstallFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions
Name = "RemoveExtensions";
-   Typ = "65";
+   Typ = "3585";
Source = "shlxtmsi.dll";
Target = "RemoveExtensions";
Inbinarytable = 1;
-   Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not 
PATCH", "FileCost");
+   Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not 
PATCH", "InstallFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Set_Admininstall
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - framework/source

[Caolán McNamara]

 framework/source/jobs/jobdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55f5b676d49f5660c6241b03f1fb5a2bf556a969
Author: Caolán McNamara 
Date:   Tue Jun 5 16:03:17 2012 +0100

extra trailing NUL char in string

This began life as ::rtl::OUString::createFromAscii which stops at the first
NULL terminator. So drop the \0 to get the same results

Change-Id: I7d9abbff2a6e6131ef5e7208e05cfd13178418cb
(cherry picked from commit 0665c3e52b0b0053c3d622d3fa975d4234801bdd)

Signed-off-by: Caolán McNamara 

diff --git a/framework/source/jobs/jobdata.cxx 
b/framework/source/jobs/jobdata.cxx
index c1cbcf8..a6cf7c4 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -583,7 +583,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
 we have to encode all '?' signs. Otherwhise e.g. "??-" will be 
translated
 to "~" ...
  */
-static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*\0");
+static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*");
 WildCard aISOPattern(PATTERN_ISO8601);
 
 sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

[Caolán McNamara]

 framework/source/jobs/jobdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0665c3e52b0b0053c3d622d3fa975d4234801bdd
Author: Caolán McNamara 
Date:   Tue Jun 5 16:03:17 2012 +0100

extra trailing NUL char in string

This began life as ::rtl::OUString::createFromAscii which stops at the first
NULL terminator. So drop the \0 to get the same results

Change-Id: I7d9abbff2a6e6131ef5e7208e05cfd13178418cb

diff --git a/framework/source/jobs/jobdata.cxx 
b/framework/source/jobs/jobdata.cxx
index c1cbcf8..a6cf7c4 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -583,7 +583,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
 we have to encode all '?' signs. Otherwhise e.g. "??-" will be 
translated
 to "~" ...
  */
-static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*\0");
+static ::rtl::OUString PATTERN_ISO8601("\?\?\?\?-\?\?-\?\?*");
 WildCard aISOPattern(PATTERN_ISO8601);
 
 sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][REVIEW:3-5] fdo#50539 fix RTF import of automatic character background color

[Caolán McNamara]

On Tue, 2012-06-05 at 16:27 +0200, Miklos Vajna wrote:
> Hi,
> 
> See
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bbb849
> 
> A similar issue was already backported for paragraph background color,
> this is the same, but for character backgrounds.

pushed to 3-5

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41bb183bfb366d04817b4c2522e12936d473d99c
Author: Miklos Vajna 
Date:   Fri Jun 1 16:30:06 2012 +0200

fdo#50539 fix RTF import of automatic character background color

Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93

Signed-off-by: Caolán McNamara 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ea14c57..f76e1e2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2376,6 +2376,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 
m_aDefaultState.aCharacterSprms->push_back(make_pair(NS_sprm::LN_CLidBi, 
pIntValue));
 break;
 case RTF_CHCBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, 
NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW:3-5] fdo#50539 fix RTF import of automatic character background color

[Miklos Vajna]

Hi,

See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bbb849

A similar issue was already backported for paragraph background color,
this is the same, but for character backgrounds.

Thanks,

Miklos
>From 697b6dea49d2ebbe1c1cf0b726ebd5647dea8519 Mon Sep 17 00:00:00 2001
From: Miklos Vajna 
Date: Fri, 1 Jun 2012 16:30:06 +0200
Subject: [PATCH] fdo#50539 fix RTF import of automatic character background
 color

Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93
---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ea14c57..f76e1e2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2376,6 +2376,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
 m_aDefaultState.aCharacterSprms->push_back(make_pair(NS_sprm::LN_CLidBi, pIntValue));
 break;
 case RTF_CHCBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
-- 
1.7.7

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - android/Bootstrap android/experimental Makefile.top Module_tail_build.mk Repository.mk RepositoryModule_ooo.mk sal/android touch/CustomTarget_touch_javamaker.mk to

[Tor Lillqvist]

 Makefile.top   
  |1 
 Module_tail_build.mk   
  |1 
 Repository.mk  
  |8 
 RepositoryModule_ooo.mk
  |1 
 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java   
  |2 
 android/experimental/DocumentLoader/Makefile   
  |2 
 
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |  195 +
 sal/android/lo-bootstrap.c 
  |   23 +
 touch/CustomTarget_touch_javamaker.mk  
  |   21 
 touch/InternalUnoApi_touch.mk  
  |   33 +
 touch/Library_libotouch.mk 
  |   39 +
 touch/Makefile 
  |7 
 touch/Module_touch.mk  
  |   22 +
 touch/Package_inc.mk   
  |   13 
 touch/README   
  |   20 
 touch/idl/org/libreoffice/touch/Document.idl   
  |   25 +
 touch/idl/org/libreoffice/touch/DocumentRenderCallback.idl 
  |   25 +
 touch/idl/org/libreoffice/touch/XDocument.idl  
  |   73 +++
 touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl
  |   55 ++
 touch/inc/touch/libotouch.hxx  
  |   15 
 touch/prj/build.lst
  |1 
 touch/source/generic/libotouch.cxx 
  |   11 
 touch/source/ios/ios.cxx   
  |   10 
 touch/source/uno/Document.cxx  
  |  213 ++
 vcl/android/androidinst.cxx
  |2 
 vcl/headless/svpbmp.cxx
  |1 
 vcl/headless/svpframe.cxx  
  |5 
 vcl/headless/svpvd.cxx 
  |6 
 28 files changed, 744 insertions(+), 86 deletions(-)

New commits:
commit 8ae077379edcdbf7bf106121593361d2486aacb7
Author: Tor Lillqvist 
Date:   Tue Jun 5 17:05:56 2012 +0300

Use 32bpp bitmaps on Android (and iOS)

Modify DocumentLoader correspondingly. Take Android bug 32588 into
account.

Ideal would be to extend the XDevice stuff, or something, so that one
could hand it a pre-allocated RGBA buffer into which the
drawing/rendering would go. Then one could get rid of the silly
convert-to-BMP phase, which prefixes the bitmap data with BMP and DIB
headers (and thus, I guess, has to copy and allocate another
copy). Will see.

Change-Id: I4597cd933db8faa8105dc8f19638d712d5d2238a

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 47366a2..1f0c14e 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -116,6 +116,8 @@ public class Bootstrap extends NativeActivity
 // documentation sucks.
 public static native void twiddle_BGR_to_RGBA(byte[] source, int offset, 
int width, int height, ByteBuffer destination);
 
+public static native void force_full_alpha(byte[] source, int offset, int 
size);
+
 // This setup() method is called 1) in apps that use *this* class as their 
activity from onCreate(),
 // and 2) should be called from other kinds of LO code using apps.
 public static void setup(Activity activity)
diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 1e9cebc..8129948 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -262,8 +262,10 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
 
 run:
+# /data/local/tmp/sample-document.odt
adb shell am start -n org.libreoffice.android.examples/.DocumentLoader 
-e input /assets/test1.odt
 
+

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - framework/source icon-themes/galaxy sc/uiconfig sw/uiconfig

[Jan Holesovsky]

 framework/source/services/backingwindow.cxx  |2 +-
 icon-themes/galaxy/brand/shell/backing_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_right.png |binary
 icon-themes/galaxy/brand/shell/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
 icon-themes/galaxy/brand/shell/backing_space.png |binary
 sc/uiconfig/scalc/statusbar/statusbar.xml|4 ++--
 sw/uiconfig/sglobal/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/sweb/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swform/statusbar/statusbar.xml   |4 ++--
 sw/uiconfig/swreport/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swriter/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/swxform/statusbar/statusbar.xml  |4 ++--
 13 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 51bc62d4df7311a27cebfc1afd160908b431cba7
Author: Jan Holesovsky 
Date:   Tue Jun 5 16:08:31 2012 +0200

status bar: Normalize the selection and modification status icons sizes.

Change-Id: I4c11c82df0fdbf0040729323dc1fda2ece7f2582

diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml 
b/sc/uiconfig/scalc/statusbar/statusbar.xml
index 95be231..8a0819a 100644
--- a/sc/uiconfig/scalc/statusbar/statusbar.xml
+++ b/sc/uiconfig/scalc/statusbar/statusbar.xml
@@ -4,8 +4,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sglobal/statusbar/statusbar.xml 
b/sw/uiconfig/sglobal/statusbar/statusbar.xml
index e6c495f..ac30138 100644
--- a/sw/uiconfig/sglobal/statusbar/statusbar.xml
+++ b/sw/uiconfig/sglobal/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sweb/statusbar/statusbar.xml 
b/sw/uiconfig/sweb/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/sweb/statusbar/statusbar.xml
+++ b/sw/uiconfig/sweb/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swform/statusbar/statusbar.xml 
b/sw/uiconfig/swform/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/swform/statusbar/statusbar.xml
+++ b/sw/uiconfig/swform/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swreport/statusbar/statusbar.xml 
b/sw/uiconfig/swreport/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/swreport/statusbar/statusbar.xml
+++ b/sw/uiconfig/swreport/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/statusbar/statusbar.xml 
b/sw/uiconfig/swriter/statusbar/statusbar.xml
index 0df1585..27c4ed6 100644
--- a/sw/uiconfig/swriter/statusbar/statusbar.xml
+++ b/sw/uiconfig/swriter/statusbar/statusbar.xml
@@ -6,8 +6,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swxform/statusbar/statusbar.xml 
b/sw/uiconfig/swxform/statusbar/statusbar.xml
index e6c495f..ac30138 100644
--- a/sw/uiconfig/swxform/statusbar/statusbar.xml
+++ b/sw/uiconfig/swxform/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
commit f1420084e0ba28f1520b0bf166bdaa9a765b97ca
Author: Jan Holesovsky 
Date:   Tue Jun 5 16:00:51 2012 +0200

start centre: Solid color fits the new artwork better.

Change-Id: Iee1e599ab9bcf7b6b26efb72b609309d7ba4e13d

diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index 92b0b7f..1ffd433 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -640,7 +640,7 @@ void BackingWindow::layoutButton(
 
 void BackingWindow::Paint( const Rectangle& )
 {
-Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
+Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceColor() );
 Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
 Rectangle aBmpRect(maControlRect);
 aBmpRect.Left()   -= nShadowLeft;
commit 1d8d2d45cf0aab10e9b9d5c0f7ce2334c29286c2
Author: Mirek Mazel 
Date:   Tue Jun 5 15:46:32 2012 +0200

New StartCentre artwork.

Change-Id: I1dc2be26f0064f4bb49cda7fb76cf71414025fe7

diff --git a/icon-themes/galaxy/brand/shell/backing_left.png 
b/icon-themes/galaxy/brand/shell/backing_left.png
index a4d5ba2..8819380 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_left.png and 
b/icon-themes/galaxy/brand/shell/backing_left.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_right.png 
b/icon-themes/galaxy/brand/shell/backing_right.png
index b95e877..343daa3 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_right.png and 
b/icon-themes/galaxy/brand/shell/backing_right.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_left.png 
b/icon-themes/galaxy/brand/shell/backing_rtl_left.png
index a4d5ba2..8819380 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_left.png and 
b/icon-themes/galaxy/brand/shell/backing_rtl_left.png differ
di

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTa

[Michael Stahl]

 testtools/CustomTarget_bridgetest.mk   |   47 ++---
 testtools/CustomTarget_bridgetest_climaker.mk  |9 ++--
 testtools/CustomTarget_bridgetest_javamaker.mk |   10 ++---
 testtools/CustomTarget_uno_test.mk |   11 +++--
 4 files changed, 36 insertions(+), 41 deletions(-)

New commits:
commit 160181bbf11586796a6deb50ad13d895f3a74727
Author: Michael Stahl 
Date:   Tue Jun 5 16:04:20 2012 +0200

normalize gbuild variable names in testtools.

Variables should have module name as prefix to prevent collisions.

Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524
(cherry picked from commit 71dbf5bfd0b9622ad485a5b7620e11d8405ed474)

diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index 473613d..c30ac3d 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -26,44 +26,37 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
 
-workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
-UNO_EXE := $(OUTDIR)/bin/uno
+testtools_BRIDGEDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
 
 ifeq ($(OS),WNT)
-BATCH_SUFFIX := .bat
-GIVE_EXEC_RIGHTS=@echo
+testtools_BATCHSUFFIX := .bat
 else
-BATCH_SUFFIX :=
-GIVE_EXEC_RIGHTS=chmod +x
+testtools_BATCHSUFFIX :=
 endif
 
-bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
+   $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \
+   $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \
+   $(if $(SOLAR_JAVA),\
+   
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \
+   
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX))
 
-ifneq ($(SOLAR_JAVA),)
-bridgetest_TARGET := $(bridgetest_TARGET) \
-   $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX)
-endif
-
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
-
-$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
-   echo "$(UNO_EXE)" \
+   echo "$(call gb_Executable_get_target_for_build,uno)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.CppTestObject" \
"-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" > $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
 
 testtools_MY_CLASSPATH := 
$(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
 
-$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "java" \
@@ -71,14 +64,14 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
"com.sun.star.comp.bridge.TestComponentMain" \

\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
"singleaccept"> $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "JAVA_HOME=$(JAVA_HOME)" \
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \
-   "$(UNO_EXE)" \
+   "$(call gb_Executable_get_target_for_build,uno)" \
"-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
@@ -88,12 +81,12 @@ $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) 
:| $(workdir_SERVER)/
"-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib" \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
> $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)

[Libreoffice-commits] .: testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_uno_test.mk

[Michael Stahl]

 testtools/CustomTarget_bridgetest.mk   |   47 ++---
 testtools/CustomTarget_bridgetest_climaker.mk  |9 ++--
 testtools/CustomTarget_bridgetest_javamaker.mk |   10 ++---
 testtools/CustomTarget_uno_test.mk |   11 +++--
 4 files changed, 36 insertions(+), 41 deletions(-)

New commits:
commit 71dbf5bfd0b9622ad485a5b7620e11d8405ed474
Author: Michael Stahl 
Date:   Tue Jun 5 16:04:20 2012 +0200

normalize gbuild variable names in testtools.

Variables should have module name as prefix to prevent collisions.

Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524

diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index 473613d..c30ac3d 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -26,44 +26,37 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
 
-workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
-UNO_EXE := $(OUTDIR)/bin/uno
+testtools_BRIDGEDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
 
 ifeq ($(OS),WNT)
-BATCH_SUFFIX := .bat
-GIVE_EXEC_RIGHTS=@echo
+testtools_BATCHSUFFIX := .bat
 else
-BATCH_SUFFIX :=
-GIVE_EXEC_RIGHTS=chmod +x
+testtools_BATCHSUFFIX :=
 endif
 
-bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
+   $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \
+   $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \
+   $(if $(SOLAR_JAVA),\
+   
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \
+   
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX))
 
-ifneq ($(SOLAR_JAVA),)
-bridgetest_TARGET := $(bridgetest_TARGET) \
-   $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX)
-endif
-
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
-
-$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
-   echo "$(UNO_EXE)" \
+   echo "$(call gb_Executable_get_target_for_build,uno)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.CppTestObject" \
"-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" > $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
 
 testtools_MY_CLASSPATH := 
$(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
 
-$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "java" \
@@ -71,14 +64,14 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
"com.sun.star.comp.bridge.TestComponentMain" \

\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
"singleaccept"> $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "JAVA_HOME=$(JAVA_HOME)" \
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \
-   "$(UNO_EXE)" \
+   "$(call gb_Executable_get_target_for_build,uno)" \
"-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
@@ -88,12 +81,12 @@ $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) 
:| $(workdir_SERVER)/
"-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib" \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
> $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_client$(tes

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkgdi.hxx   |5 +
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |  110 ++-
 2 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit 797c51759f332adb3241da0abc904b11a39eb6d4
Author: Ruslan Kabatsayev 
Date:   Sat Jun 2 16:04:51 2012 +0400

GTK theming: implement frame rendering

Change-Id: I7efa167cee05f84c56f554b5c2002e825809
(cherry picked from commit 0d314b0158b9d3660973656597d25a1504987b93)

Signed-off-by: Caolán McNamara 

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index fbdcef1..b4fe837 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -165,6 +165,11 @@ protected:
 GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect );
 sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
 
+sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, 
ControlPart nPart,
+   const Rectangle& rControlRectangle,
+   const clipList& rClipList,
+   ControlState nState, const ImplControlValue& aValue,
+   const OUString& rCaption );
 sal_Bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType 
nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e9101bf..b21f12c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -45,6 +45,8 @@
 
 #include "vcl/vclenum.hxx"
 #include "vcl/fontmanager.hxx"
+#include 
+
 typedef struct _cairo_font_options cairo_font_options_t;
 const char* const tabPrelitDataName="libreoffice-tab-is-prelit";
 
@@ -243,6 +245,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption );
+
+static int getFrameWidth(GtkWidget* widget);
 //---
 
 static Rectangle NWGetScrollButtonRect(SalX11Screen nScreen, ControlPart 
nPart, Rectangle aAreaRect );
@@ -581,6 +585,7 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( 
ControlType nType, ControlPar
 return true;
 break;
 
+case CTRL_FRAME:
 case CTRL_WINDOW_BACKGROUND:
 return true;
 
@@ -768,7 +773,6 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 // get a GC with current clipping region set
 GetFontGC();
 
-
 // theme changed ?
 if( GtkSalGraphics::bThemeChanged )
 {
@@ -918,6 +922,11 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 returnVal = NWPaintGTKWindowBackground( gdkDrawable, nType, nPart, 
aCtrlRect, aClip, nState, aValue, rCaption );
 }
 
+if(nType==CTRL_FRAME)
+{
+returnVal = NWPaintGTKFrame( gdkDrawable, nType, nPart, aCtrlRect, 
aClip, nState, aValue, rCaption);
+}
+
 if( pixmap )
 {
 returnVal = NWRenderPixmapToScreen( pixmap, aPixmapRect ) && returnVal;
@@ -1144,6 +1153,33 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 rNativeBoundingRegion = rNativeContentRegion = aRect;
 returnVal = sal_True;
 }
+if( nType == CTRL_FRAME && nPart == PART_BORDER )
+{
+int frameWidth = getFrameWidth(m_pWindow);
+rNativeBoundingRegion = rControlRegion;
+sal_uInt16 nStyle = aValue.getNumericVal();
+int x1=rControlRegion.Left();
+int y1=rControlRegion.Top();
+int x2=rControlRegion.Right();
+int y2=rControlRegion.Bottom();
+
+if( nStyle & FRAME_DRAW_NODRAW )
+{
+if( (nStyle & FRAME_DRAW_TOPBOTTOM) == FRAME_DRAW_TOPBOTTOM )
+rNativeContentRegion = Rectangle(x1,
+ y1+frameWidth,
+ x2,
+ y2-frameWidth);
+else
+rNativeContentRegion = Rectangle(x1+frameWidth,
+ y1+frameWidth,
+ x2-frameWidth,
+ y2-frameWidth);
+}
+else
+rNativeContentRegion = rControlRegion;
+returnVal=true;
+}
 
 return( returnVal );
 }
@@ -1151,6 +1187,73 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 /
  * Individual control drawing functions
  /
+sal_Bool GtkSalGraphics::NWPaintGTKFrame(
+GdkDrawable* gdkDrawable

[Libreoffice-commits] .: oox/source

[Miklos Vajna]

 oox/source/drawingml/textparagraphproperties.cxx |   25 ++-
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 9dc26ca9461dbb539c523c8bd68ce171aab25d90
Author: Miklos Vajna 
Date:   Tue Jun 5 16:13:26 2012 +0200

TextParagraphProperties::pushToPropSet: limit effect of failed numrule 
import

Fixes missing paragraph properties in Writer when importing SmartArt.

Change-Id: I0091d7156b30b7ef99e550d7252a60676c23046e

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index e82124d..abd0b3b 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -443,18 +443,25 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 aPropSet.getProperty( xNumRule, PROP_NumberingRules );
 OSL_ENSURE( xNumRule.is(), "can't get Numbering rules");
 
-if( xNumRule.is() )
+try
 {
-if( !rioBulletMap.empty() )
+if( xNumRule.is() )
 {
-// fix default bullet size to be 100%
-if( rioBulletMap.find( PROP_BulletRelSize ) == 
rioBulletMap.end() )
-rioBulletMap[ PROP_BulletRelSize ] <<= static_cast< 
sal_Int16 >( 100 );
-Sequence< PropertyValue > aBulletPropSeq = 
rioBulletMap.makePropertyValueSequence();
-xNumRule->replaceByIndex( getLevel(), makeAny( aBulletPropSeq 
) );
+if( !rioBulletMap.empty() )
+{
+// fix default bullet size to be 100%
+if( rioBulletMap.find( PROP_BulletRelSize ) == 
rioBulletMap.end() )
+rioBulletMap[ PROP_BulletRelSize ] <<= static_cast< 
sal_Int16 >( 100 );
+Sequence< PropertyValue > aBulletPropSeq = 
rioBulletMap.makePropertyValueSequence();
+xNumRule->replaceByIndex( getLevel(), makeAny( 
aBulletPropSeq ) );
+}
+
+aPropSet.setProperty( PROP_NumberingRules, xNumRule );
 }
-
-aPropSet.setProperty( PROP_NumberingRules, xNumRule );
+}
+catch (const Exception &)
+{
+// Don't warn for now, expected to fail for Writer.
 }
 }
 if ( noParaLeftMargin )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - framework/source icon-themes/galaxy sc/uiconfig sw/uiconfig

[Jan Holesovsky]

 framework/source/services/backingwindow.cxx  |2 +-
 icon-themes/galaxy/brand/shell/backing_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_right.png |binary
 icon-themes/galaxy/brand/shell/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
 icon-themes/galaxy/brand/shell/backing_space.png |binary
 sc/uiconfig/scalc/statusbar/statusbar.xml|4 ++--
 sw/uiconfig/sglobal/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/sweb/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swform/statusbar/statusbar.xml   |4 ++--
 sw/uiconfig/swreport/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swriter/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/swxform/statusbar/statusbar.xml  |4 ++--
 13 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 4d6368d6bba270f6f4d985eaac475be584d5d13d
Author: Jan Holesovsky 
Date:   Tue Jun 5 16:08:31 2012 +0200

status bar: Normalize the selection and modification status icons sizes.

Change-Id: I4c11c82df0fdbf0040729323dc1fda2ece7f2582

diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml 
b/sc/uiconfig/scalc/statusbar/statusbar.xml
index 95be231..8a0819a 100644
--- a/sc/uiconfig/scalc/statusbar/statusbar.xml
+++ b/sc/uiconfig/scalc/statusbar/statusbar.xml
@@ -4,8 +4,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sglobal/statusbar/statusbar.xml 
b/sw/uiconfig/sglobal/statusbar/statusbar.xml
index e6c495f..ac30138 100644
--- a/sw/uiconfig/sglobal/statusbar/statusbar.xml
+++ b/sw/uiconfig/sglobal/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/sweb/statusbar/statusbar.xml 
b/sw/uiconfig/sweb/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/sweb/statusbar/statusbar.xml
+++ b/sw/uiconfig/sweb/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swform/statusbar/statusbar.xml 
b/sw/uiconfig/swform/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/swform/statusbar/statusbar.xml
+++ b/sw/uiconfig/swform/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swreport/statusbar/statusbar.xml 
b/sw/uiconfig/swreport/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/swreport/statusbar/statusbar.xml
+++ b/sw/uiconfig/swreport/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/statusbar/statusbar.xml 
b/sw/uiconfig/swriter/statusbar/statusbar.xml
index 0df1585..27c4ed6 100644
--- a/sw/uiconfig/swriter/statusbar/statusbar.xml
+++ b/sw/uiconfig/swriter/statusbar/statusbar.xml
@@ -6,8 +6,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swxform/statusbar/statusbar.xml 
b/sw/uiconfig/swxform/statusbar/statusbar.xml
index e6c495f..ac30138 100644
--- a/sw/uiconfig/swxform/statusbar/statusbar.xml
+++ b/sw/uiconfig/swxform/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  
  
  
- 
- 
+ 
+ 
  
  
  
commit ef59ee5abb2f551e7a78e6ba41ba8bf351f5a034
Author: Jan Holesovsky 
Date:   Tue Jun 5 16:00:51 2012 +0200

start centre: Solid color fits the new artwork better.

Change-Id: Iee1e599ab9bcf7b6b26efb72b609309d7ba4e13d

diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index 92b0b7f..1ffd433 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -640,7 +640,7 @@ void BackingWindow::layoutButton(
 
 void BackingWindow::Paint( const Rectangle& )
 {
-Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
+Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceColor() );
 Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
 Rectangle aBmpRect(maControlRect);
 aBmpRect.Left()   -= nShadowLeft;
commit e1a1d1e02cf44487aa47160941877daec99601b8
Author: Mirek Mazel 
Date:   Tue Jun 5 15:46:32 2012 +0200

New StartCentre artwork.

Change-Id: I1dc2be26f0064f4bb49cda7fb76cf71414025fe7

diff --git a/icon-themes/galaxy/brand/shell/backing_left.png 
b/icon-themes/galaxy/brand/shell/backing_left.png
index a4d5ba2..8819380 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_left.png and 
b/icon-themes/galaxy/brand/shell/backing_left.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_right.png 
b/icon-themes/galaxy/brand/shell/backing_right.png
index b95e877..343daa3 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_right.png and 
b/icon-themes/galaxy/brand/shell/backing_right.png differ
diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_left.png 
b/icon-themes/galaxy/brand/shell/backing_rtl_left.png
index a4d5ba2..8819380 100644
Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_left.png and 
b/icon-themes/galaxy/brand/shell/backing_rtl_left.png differ
di

[Libreoffice-commits] .: extras/prj extras/source extras/util

[Andras Timar]

 dev/null  |binary
 extras/prj/build.lst  |1 
 extras/source/symbols/delzip  |1 
 extras/source/symbols/makefile.mk |   51 --
 extras/util/target.pmk|3 --
 5 files changed, 56 deletions(-)

New commits:
commit ea08541bd644d671c7cef6b64311cd8a691a207c
Author: Andras Timar 
Date:   Tue Jun 5 16:03:55 2012 +0200

Revert "Revert "Remove ugly symbols""

This reverts commit e74c007e25d05e49d94a94d9b024076faa02c8d0.

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 3aca646..a9fd80a 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -70,7 +70,6 @@ er  extras\source\gallery\accessories\Elements\Bullets2   
   nmake   -
 er  extras\source\gallery\accessories-nonfree   nmake  
 -   all er_gaccenf NULL
 er extras\source\misc_config   nmake   -   
all er_mcnf NULL
 er extras\source\palettes  nmake   -   
all er_palet NULL
-er extras\source\symbols   nmake   -   
all er_symb NULL
 er  extras\source\templates\layout  nmake   -  
 all er_tlal NULL
 er  extras\source\templates\presnt\lang nmake   -  
 all er_tprel NULL
 er  extras\source\templates\wizard\agenda\lang  nmake   -  
 all er_twagl NULL
diff --git a/extras/source/symbols/delzip b/extras/source/symbols/delzip
deleted file mode 100644
index 636fda9..000
--- a/extras/source/symbols/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/extras/source/symbols/l_2people.bmp 
b/extras/source/symbols/l_2people.bmp
deleted file mode 100644
index 5b7a8fc..000
Binary files a/extras/source/symbols/l_2people.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention1.bmp 
b/extras/source/symbols/l_attention1.bmp
deleted file mode 100644
index bf6890f..000
Binary files a/extras/source/symbols/l_attention1.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention2.bmp 
b/extras/source/symbols/l_attention2.bmp
deleted file mode 100644
index 120c9e9..000
Binary files a/extras/source/symbols/l_attention2.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention3.bmp 
b/extras/source/symbols/l_attention3.bmp
deleted file mode 100644
index 7b48a9c..000
Binary files a/extras/source/symbols/l_attention3.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_candy.bmp 
b/extras/source/symbols/l_candy.bmp
deleted file mode 100644
index 935fdf8..000
Binary files a/extras/source/symbols/l_candy.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_face.bmp b/extras/source/symbols/l_face.bmp
deleted file mode 100644
index c44d956..000
Binary files a/extras/source/symbols/l_face.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_flower.bmp 
b/extras/source/symbols/l_flower.bmp
deleted file mode 100644
index ced7409..000
Binary files a/extras/source/symbols/l_flower.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_ghost.bmp 
b/extras/source/symbols/l_ghost.bmp
deleted file mode 100644
index 877ba27..000
Binary files a/extras/source/symbols/l_ghost.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_halloween.bmp 
b/extras/source/symbols/l_halloween.bmp
deleted file mode 100644
index 8326cd2..000
Binary files a/extras/source/symbols/l_halloween.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_home.bmp b/extras/source/symbols/l_home.bmp
deleted file mode 100644
index c34900a..000
Binary files a/extras/source/symbols/l_home.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lamp.bmp b/extras/source/symbols/l_lamp.bmp
deleted file mode 100644
index 6a824ef..000
Binary files a/extras/source/symbols/l_lamp.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lock.bmp b/extras/source/symbols/l_lock.bmp
deleted file mode 100644
index 986f4d0..000
Binary files a/extras/source/symbols/l_lock.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_b.bmp 
b/extras/source/symbols/l_page_b.bmp
deleted file mode 100644
index 94c3c67..000
Binary files a/extras/source/symbols/l_page_b.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_g.bmp 
b/extras/source/symbols/l_page_g.bmp
deleted file mode 100644
index f0b8d7d..000
Binary files a/extras/source/symbols/l_page_g.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_y.bmp 
b/extras/source/symbols/l_page_y.bmp
deleted file mode 100644
index 39e7c98..000
Binary files a/extras/source/symbols/l_page_y.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_people.bmp 
b/extras/source/symbols/l_people.bmp
deleted file mode 100644
index 1123390..000
Binary files a/extras/source/symbols/l_people.bmp and /dev/null differ
diff --git 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - extras/prj extras/source extras/util

[Andras Timar]

 dev/null  |binary
 extras/prj/build.lst  |1 
 extras/source/symbols/delzip  |1 
 extras/source/symbols/makefile.mk |   51 --
 extras/util/target.pmk|3 --
 5 files changed, 56 deletions(-)

New commits:
commit 4dd1f2d3cdcb34428ba53ccec305713a7195ea20
Author: Andras Timar 
Date:   Tue Jun 5 16:02:34 2012 +0200

Revert "Revert "Remove ugly symbols""

This reverts commit e74c007e25d05e49d94a94d9b024076faa02c8d0.

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 3aca646..a9fd80a 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -70,7 +70,6 @@ er  extras\source\gallery\accessories\Elements\Bullets2   
   nmake   -
 er  extras\source\gallery\accessories-nonfree   nmake  
 -   all er_gaccenf NULL
 er extras\source\misc_config   nmake   -   
all er_mcnf NULL
 er extras\source\palettes  nmake   -   
all er_palet NULL
-er extras\source\symbols   nmake   -   
all er_symb NULL
 er  extras\source\templates\layout  nmake   -  
 all er_tlal NULL
 er  extras\source\templates\presnt\lang nmake   -  
 all er_tprel NULL
 er  extras\source\templates\wizard\agenda\lang  nmake   -  
 all er_twagl NULL
diff --git a/extras/source/symbols/delzip b/extras/source/symbols/delzip
deleted file mode 100644
index 636fda9..000
--- a/extras/source/symbols/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/extras/source/symbols/l_2people.bmp 
b/extras/source/symbols/l_2people.bmp
deleted file mode 100644
index 5b7a8fc..000
Binary files a/extras/source/symbols/l_2people.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention1.bmp 
b/extras/source/symbols/l_attention1.bmp
deleted file mode 100644
index bf6890f..000
Binary files a/extras/source/symbols/l_attention1.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention2.bmp 
b/extras/source/symbols/l_attention2.bmp
deleted file mode 100644
index 120c9e9..000
Binary files a/extras/source/symbols/l_attention2.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention3.bmp 
b/extras/source/symbols/l_attention3.bmp
deleted file mode 100644
index 7b48a9c..000
Binary files a/extras/source/symbols/l_attention3.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_candy.bmp 
b/extras/source/symbols/l_candy.bmp
deleted file mode 100644
index 935fdf8..000
Binary files a/extras/source/symbols/l_candy.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_face.bmp b/extras/source/symbols/l_face.bmp
deleted file mode 100644
index c44d956..000
Binary files a/extras/source/symbols/l_face.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_flower.bmp 
b/extras/source/symbols/l_flower.bmp
deleted file mode 100644
index ced7409..000
Binary files a/extras/source/symbols/l_flower.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_ghost.bmp 
b/extras/source/symbols/l_ghost.bmp
deleted file mode 100644
index 877ba27..000
Binary files a/extras/source/symbols/l_ghost.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_halloween.bmp 
b/extras/source/symbols/l_halloween.bmp
deleted file mode 100644
index 8326cd2..000
Binary files a/extras/source/symbols/l_halloween.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_home.bmp b/extras/source/symbols/l_home.bmp
deleted file mode 100644
index c34900a..000
Binary files a/extras/source/symbols/l_home.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lamp.bmp b/extras/source/symbols/l_lamp.bmp
deleted file mode 100644
index 6a824ef..000
Binary files a/extras/source/symbols/l_lamp.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lock.bmp b/extras/source/symbols/l_lock.bmp
deleted file mode 100644
index 986f4d0..000
Binary files a/extras/source/symbols/l_lock.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_b.bmp 
b/extras/source/symbols/l_page_b.bmp
deleted file mode 100644
index 94c3c67..000
Binary files a/extras/source/symbols/l_page_b.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_g.bmp 
b/extras/source/symbols/l_page_g.bmp
deleted file mode 100644
index f0b8d7d..000
Binary files a/extras/source/symbols/l_page_g.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_y.bmp 
b/extras/source/symbols/l_page_y.bmp
deleted file mode 100644
index 39e7c98..000
Binary files a/extras/source/symbols/l_page_y.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_people.bmp 
b/extras/source/symbols/l_people.bmp
deleted file mode 100644
index 1123390..000
Binary files a/extras/source/symbols/l_people.bmp and /dev/null differ
diff --git 

[Libreoffice-commits] .: oox/source

[Miklos Vajna]

 oox/source/drawingml/textparagraph.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25d7dffde13ecf32df1cce521a91c7075f372167
Author: Miklos Vajna 
Date:   Tue Jun 5 15:55:13 2012 +0200

oox::drawingml::TextParagraph: OSL_TRACE -> SAL_INFO

Change-Id: I79af1d624c420dff87751691ff8aa484fd3de2b6

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 63a2845..adaae12 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -65,7 +65,7 @@ void TextParagraph::insertAt(
 
 sal_Int16 nLevel = maProperties.getLevel();
 
-OSL_TRACE("TextParagraph::insertAt() - level %d", nLevel);
+SAL_INFO("oox", "TextParagraph::insertAt() - level " << nLevel);
 
 const TextParagraphPropertiesVector& rListStyle = 
rTextListStyle.getListStyle();
 if ( nLevel >= static_cast< sal_Int16 >( rListStyle.size() ) )
@@ -143,7 +143,7 @@ void TextParagraph::insertAt(
 }
 catch( Exception & )
 {
-OSL_TRACE("OOX: exception in TextParagraph::insertAt");
+SAL_INFO("oox", "exception in TextParagraph::insertAt");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: packimages: many files not found

[Korrawit Pruegsanusak]

Hello,

On Sat, Jan 21, 2012 at 9:43 AM, Korrawit Pruegsanusak
 wrote:
> From a tinderbox success build log [1] of master branch, we have these
> errors:

For a record, this is reported at fdo#50630 and fixed by David Tardon.
Thanks a lot! :-)

Best Regards,
-- 
Korrawit Pruegsanusak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement

[Mirek M.]

All of my past & future contributions to LibreOffice may be licensed under
the MPL/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice