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

2012-04-14 Thread Kohei Yoshida 
 editeng/inc/editeng/editeng.hxx|1 +
 editeng/source/editeng/editeng.cxx |5 +
 editeng/source/editeng/impedit.cxx |2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 89de9dfe27d6a406fb67570c3507a8ea2e387d24
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Sat Apr 14 02:03:46 2012 -0400

Really fix the build.

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index f3be3d2..8cdc6ef 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -139,6 +139,7 @@ private:
 
 EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
 EDITENG_DLLPRIVATE void CheckIdleFormatter();
+EDITENG_DLLPRIVATE bool IsIdleFormatterActive() const;
 EDITENG_DLLPRIVATE ParaPortion* FindParaPortion(ContentNode* pNode);
 EDITENG_DLLPRIVATE const ParaPortion* FindParaPortion(ContentNode* pNode) 
const;
 EDITENG_DLLPRIVATE const ParaPortion* GetPrevVisPortion(const ParaPortion* 
pCurPortion) const;
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 0adfec1..3410fba 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -702,6 +702,11 @@ void EditEngine::CheckIdleFormatter()
 pImpEditEngine-CheckIdleFormatter();
 }
 
+bool EditEngine::IsIdleFormatterActive() const
+{
+return pImpEditEngine-aIdleFormatter.IsActive();
+}
+
 ParaPortion* EditEngine::FindParaPortion(ContentNode* pNode)
 {
 return pImpEditEngine-FindParaPortion(pNode);
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 81edb23..3b31282 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -174,7 +174,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, 
Region* pRegion )
 pOutWin-GetCursor()-Hide();
 }
 
-DBG_ASSERT( !pEditEngine-aIdleFormatter.IsActive(), DrawSelection: Not 
formatted! );
+DBG_ASSERT( !pEditEngine-IsIdleFormatterActive(), DrawSelection: Not 
formatted! );
 aTmpSel.Adjust( pEditEngine-pImpEditEngine-GetEditDoc() );
 
 ContentNode* pStartNode = aTmpSel.Min().GetNode();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

2012-04-14 Thread David Tardon 
 solenv/inc/settings.mk  |2 +-
 solenv/inc/unxaigppc.mk |2 +-
 solenv/inc/unxandr.mk   |2 +-
 solenv/inc/unxgcc.mk|2 +-
 solenv/inc/unxmacx.mk   |2 +-
 solenv/inc/unxnbsd.mk   |2 +-
 solenv/inc/unxsoli4.mk  |2 +-
 solenv/inc/unxsols4.mk  |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bcc942451d7b5291d3f4c56ccd6868b23e2e923c
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 08:11:37 2012 +0200

really replace SDK with SDKBIN

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 9988f7c..575fdc9 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1226,7 +1226,7 @@ RCLINKFLAGS+= $(ENVRCLINKFLAGS)
 LINKFLAGSRUNPATH_URELIB*=
 LINKFLAGSRUNPATH_UREBIN*=
 LINKFLAGSRUNPATH_OOO*=
-LINKFLAGSRUNPATH_SDK*=
+LINKFLAGSRUNPATH_SDKBIN*=
 LINKFLAGSRUNPATH_OXT*=
 LINKFLAGSRUNPATH_NONE*=
 
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 5e67079..983ae74 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -43,7 +43,7 @@ BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) 
$(foreach,i,{$(PRODUCTLIST)} /opt
 LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 
LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
 
LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_SDKBIN:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
 
 LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index e8cbd9e..812c932 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -66,4 +66,4 @@ ENFORCEDSHLPREFIX=lib
 LINKFLAGSRUNPATH_URELIB=
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 151fc8b..2da3ef0 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -195,7 +195,7 @@ 
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
 
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 
LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index c829a45..e402783 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -185,7 +185,7 @@ EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
 LINKFLAGSRUNPATH_URELIB=-install_name 
'@__URELIB/$(@:f)'
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=-install_name 
'@__OOO/$(@:f)'
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=-install_name 
'@__NONE/$(@:f)'
 LINKFLAGS=$(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
index 712ed6a..8dbe480 100644
--- a/solenv/inc/unxnbsd.mk
+++ b/solenv/inc/unxnbsd.mk
@@ -18,7 +18,7 @@ BUILD64=1
 # NetBSD has no support for using relative paths with $ORIGIN
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 
 LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index af85064..9120433 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -131,7 +131,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index e81ca0e..f1a1cd1 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp

[Libreoffice-commits] .: editeng/source

2012-04-14 Thread Julien Nabet 
 editeng/source/editeng/editdbg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit daae05ccf52e37afc41dc1976afcc1f7c6fd978c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Apr 14 10:05:34 2012 +0200

WaE fix

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index af2e37f..98b4e9c 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool 
bInfoBox )
 fprintf( fp, \nMaxAutoPaperSize: %li x %li, 
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
 fprintf( fp, \nMinAutoPaperSize: %li x %li, 
pEE-GetMinAutoPaperSize().Width(), pEE-GetMinAutoPaperSize().Height() );
 fprintf( fp, \nUpdate: %i, pEE-GetUpdateMode() );
-fprintf( fp, \nNumber of Views: %i, pEE-GetViewCount() );
+fprintf( fp, \nNumber of Views: % SAL_PRIuUINT64, pEE-GetViewCount() );
 for ( sal_uInt16 nView = 0; nView  pEE-GetViewCount(); nView++ )
 {
 EditView* pV = pEE-GetView( nView );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 6 commits - connectivity/AllLangResTarget_cnr.mk connectivity/Configuration_evoab2.mk connectivity/Configuration_evoab.mk connectivity/Li

2012-04-14 Thread David Tardon 
 Repository.mk|   12 ++--
 connectivity/AllLangResTarget_cnr.mk |   12 ++--
 connectivity/Configuration_evoab.mk  |   38 ++
 connectivity/Configuration_evoab2.mk |   38 --
 connectivity/Library_evoab.mk|   82 +++
 connectivity/Library_evoab2.mk   |   82 ---
 connectivity/Module_connectivity.mk  |4 -
 postprocess/packcomponents/makefile.mk   |   19 +--
 postprocess/packregistry/makefile.mk |   32 +---
 reportbuilder/Extension_reportbuilder.mk |   24 -
 10 files changed, 174 insertions(+), 169 deletions(-)

New commits:
commit fba02bc9fd7dc567c900508e8f354c031e45a527
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 10:10:43 2012 +0200

fix name of .res file

diff --git a/connectivity/AllLangResTarget_cnr.mk 
b/connectivity/AllLangResTarget_cnr.mk
index 2cf9bc5..3a6327a 100644
--- a/connectivity/AllLangResTarget_cnr.mk
+++ b/connectivity/AllLangResTarget_cnr.mk
@@ -25,20 +25,20 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,connectivity))
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
 
-$(eval $(call gb_AllLangResTarget_add_srs,connectivity,\
-   connectivity/res \
+$(eval $(call gb_AllLangResTarget_add_srs,cnr,\
+   cnr/res \
 ))
 
-$(eval $(call gb_SrsTarget_SrsTarget,connectivity/res))
+$(eval $(call gb_SrsTarget_SrsTarget,cnr/res))
 
-$(eval $(call gb_SrsTarget_set_include,connectivity/res,\
+$(eval $(call gb_SrsTarget_set_include,cnr/res,\
$$(INCLUDE) \
-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_SrsTarget_add_files,connectivity/res,\
+$(eval $(call gb_SrsTarget_add_files,cnr/res,\
connectivity/source/resource/conn_shared_res.src \
 ))
 
commit 4253e1d752c96af04e60548f70ad679dedced71b
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 09:53:48 2012 +0200

rename evoab2 back to evoab

diff --git a/Repository.mk b/Repository.mk
index 701cdd9..22e43ee 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -218,7 +218,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ept \
 era \
 eti \
-evoab2 \
+evoab \
 exp \
 file \
 filterconfig \
diff --git a/connectivity/Configuration_evoab.mk 
b/connectivity/Configuration_evoab.mk
new file mode 100644
index 000..ad82268
--- /dev/null
+++ b/connectivity/Configuration_evoab.mk
@@ -0,0 +1,38 @@
+# -*- 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Configuration_Configuration,driver_evoab))
+
+$(eval $(call 
gb_Configuration_add_spool_modules,driver_evoab,connectivity/registry/evoab2,\
+   org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \
+))
+
+$(eval $(call 
gb_Configuration_add_localized_datas,driver_evoab,connectivity/registry/evoab2,\
+   org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Configuration_evoab2.mk 
b/connectivity/Configuration_evoab2.mk
deleted file mode 100644
index 9221efe..000
--- a/connectivity/Configuration_evoab2.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- 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.
-#
-#

Re: [Libreoffice-commits] .: extensions/Module_extensions.mk

2012-04-14 Thread David Tardon 
On Wed, Apr 04, 2012 at 05:16:56AM -0700, Matus Kukan wrote:
  extensions/Module_extensions.mk |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 New commits:
 commit 1e7fd91514940520c33f14898c2298d1251ac34d
 Author: Mat Kukan matus.ku...@gmail.com
 Date:   Wed Apr 4 14:14:33 2012 +0200
 
 fix so_activex_idl, part two
 
 The order seems to be important here.

Hi,

that sounds like incomplete dependencies. Not something that should be
relied upon too much :-)

D.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/qa

2012-04-14 Thread Markus Mohrhard 
 sc/qa/unit/filters-test.cxx|   21 -
 sc/qa/unit/subsequent_filters-test.cxx |   21 +
 sc/qa/unit/ucalc.cxx   |   23 ++-
 3 files changed, 43 insertions(+), 22 deletions(-)

New commits:
commit d8ff1a579ff5ac9250aa052ef1a17fce51959cb0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 13 17:18:14 2012 +0200

improve autofill test case

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 130ad67..78fe168 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4179,7 +4179,28 @@ void Test::testAutoFill()
 for (SCROW i = 3; i 8; ++i)
 CPPUNIT_ASSERT_DOUBLES_EQUAL(static_castdouble(i-1.0), 
m_pDoc-GetValue(0, i, 0), 0.0001);
 
-
+m_pDoc-Fill( 0, 0, 0, 8, NULL, aMarkData, 5, FILL_TO_RIGHT );
+for (SCCOL i = 0; i  5; ++i)
+{
+for(SCROW j = 0; j  8; ++j)
+{
+if (j  2)
+{
+CPPUNIT_ASSERT_DOUBLES_EQUAL(static_castdouble(j-1+i), 
m_pDoc-GetValue(i, j, 0), 1e-8);
+}
+else if (j == 0)
+{
+CPPUNIT_ASSERT_DOUBLES_EQUAL(static_castdouble(i+1), 
m_pDoc-GetValue(i, 0, 0), 1e-8);
+}
+else if (j == 1 || j== 2)
+{
+if(i == 0)
+CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, 
m_pDoc-GetValue(0,j,0), 1e-8);
+else
+CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, m_pDoc-GetValue(i,j,0), 
1e-8);
+}
+}
+}
 
 
 m_pDoc-DeleteTab(0);
commit 97fe16f4dc5582be597971b6e17431b8d353b8ba
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Apr 13 17:04:46 2012 +0200

move testCVE into slowcheck

speed up rebuild of sc

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index de17ced..417b842 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -96,11 +96,6 @@ public:
 virtual void setUp();
 virtual void tearDown();
 
-/**
- * Ensure CVEs remain unbroken
- */
-void testCVEs();
-
 //ods, xls, xlsx filter tests
 void testRangeNameODS(); // only test ods here, xls and xlsx in 
subsequent_filters-test
 void testContentODS();
@@ -117,7 +112,6 @@ public:
 #endif
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
-CPPUNIT_TEST(testCVEs);
 CPPUNIT_TEST(testRangeNameODS);
 CPPUNIT_TEST(testContentODS);
 CPPUNIT_TEST(testContentXLS);
@@ -189,21 +183,6 @@ void ScFiltersTest::createCSVPath(const rtl::OUString 
aFileBase, rtl::OUString
 rCSVPath = aBuffer.makeStringAndClear();
 }
 
-void ScFiltersTest::testCVEs()
-{
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Quattro Pro 6.0)),
-getURLFromSrc(/sc/qa/unit/data/qpro/), rtl::OUString());
-
-//warning, the current sylk filter in sc (docsh.cxx) automatically
-//chains on failure on trying as csv, rtf, etc. so success may
-//not indicate that it imported as .slk.
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SYLK)),
-getURLFromSrc(/sc/qa/unit/data/slk/), rtl::OUString());
-
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MS Excel 97)),
-getURLFromSrc(/sc/qa/unit/data/xls/), rtl::OUString());
-}
-
 #if TEST_BUG_FILES
 
 void ScFiltersTest::testDir(osl::Directory rDir, sal_uInt32 nType)
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 1d8a8b6..f2ed04b 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -93,6 +93,11 @@ public:
 virtual void setUp();
 virtual void tearDown();
 
+/**
+ * Ensure CVEs remain unbroken
+ */
+void testCVEs();
+
 //ods, xls, xlsx filter tests
 void testRangeNameXLS();
 void testRangeNameXLSX();
@@ -115,6 +120,7 @@ public:
 
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
+CPPUNIT_TEST(testCVEs);
 CPPUNIT_TEST(testRangeNameXLS);
 CPPUNIT_TEST(testRangeNameXLSX);
 CPPUNIT_TEST(testFunctionsODS);
@@ -216,6 +222,21 @@ void ScFiltersTest::createCSVPath(const rtl::OUString 
aFileBase, rtl::OUString
 rCSVPath = aBuffer.makeStringAndClear();
 }
 
+void ScFiltersTest::testCVEs()
+{
+testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Quattro Pro 6.0)),
+getURLFromSrc(/sc/qa/unit/data/qpro/), rtl::OUString());
+
+//warning, the current sylk filter in sc (docsh.cxx) automatically
+//chains on failure on trying as csv, rtf, etc. so success may
+//not indicate that it imported as .slk.
+testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SYLK)),
+getURLFromSrc(/sc/qa/unit/data/slk/), rtl::OUString());
+
+testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MS Excel 97)),
+getURLFromSrc(/sc/qa/unit/data/xls/), rtl::OUString());
+}
+
 namespace {
 
 void testRangeNameImpl(ScDocument* pDoc)
___
Libreoffice-commits mailing list

[Libreoffice-commits] .: Branch 'feature/tubes2' - tubes/README

2012-04-14 Thread Eike Rathke 
 tubes/README |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 6e2988151beb3fd096472ae8ae8879cb41ac4640
Author: Eike Rathke er...@redhat.com
Date:   Sat Apr 14 13:06:29 2012 +0200

tubes: mention local copy of needed telepathy-glib

diff --git a/tubes/README b/tubes/README
index 126114a..d373345 100644
--- a/tubes/README
+++ b/tubes/README
@@ -8,6 +8,15 @@ the same TeleConference abstraction.
 
 To enable configure LibO with --enable-telepathy
 
+Currently (2012-04-14) at least telepathy-glib 0.18 is needed, which doesn't
+come with distributions. Download it from
+http://telepathy.freedesktop.org/releases/telepathy-glib/
+and make install it locally, e.g. with --prefix=$HOME/usr
+For LibO configure then use PKG_CONFIG_PATH=$HOME/usr/lib/pkgconfig
+To not have tubes and sc cppunittests stumble (LD_LIBRARY_PATH is not evaluated
+in unit tests and thus not a solution) copy the libs to the solver, i.e.
+cp -p $HOME/usr/lib/libtelepathy-glib.* $SRCDIR/solver/$INPATH/lib/
+
 If you have a Telepathy-enabled LibreOffice installed to /usr (including
 liboapprover) you may also want to install the .service and .client files to
 make everything service-activatable:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2012-04-14 Thread Michael Meeks 
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   34 ++
 1 file changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 2a20f94696addc362ba62d1cced1793c08e26e75
Author: Michael Meeks michael.me...@suse.com
Date:   Sat Apr 14 13:39:52 2012 +0200

gtk3: add approved theme color fetch / selection.

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6bfad00..aaa4bd7 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1166,12 +1166,17 @@ void GtkSalGraphics::updateSettings( AllSettings 
rSettings )
 aStyleSet.SetButtonRolloverTextColor( aTextColor );
 aStyleSet.SetFieldRolloverTextColor( aTextColor );
 
-#if 0
-// Tooltip colors
-GtkStyle* pTooltipStyle = gtk_widget_get_style( 
gWidgetData[m_nScreen].gTooltipPopup );
-aTextColor = getColor( pTooltipStyle-fg[ GTK_STATE_NORMAL ] );
-aStyleSet.SetHelpTextColor( aTextColor );
-#endif
+// FIXME: each gtk3 theme needs to define a set of well-known
+// color names for LibreOffice eg.
+// @define-color tooltip_bg_color #343434;
+GdkRGBA tooltip_bg_color;
+if( gtk_style_context_lookup_color( pStyle, tooltip_bg_color, 
tooltip_bg_color ) )
+{
+aStyleSet.SetHelpTextColor( getColor( tooltip_bg_color ) );
+fprintf (stderr, Set tooltip bg color %g %g %g %g\n,
+ tooltip_bg_color.red, tooltip_bg_color.green,
+ tooltip_bg_color.blue, tooltip_bg_color.alpha );
+}
 
 // background colors
 GdkRGBA background_color;
@@ -1184,15 +1189,24 @@ void GtkSalGraphics::updateSettings( AllSettings 
rSettings )
 aStyleSet.SetWorkspaceColor( aBackColor );
 aStyleSet.SetCheckedColorSpecialCase( );
 
+{ // FIXME: turn me into a helper function ...
+// construct style context for text view
+GtkStyleContext *pCStyle = gtk_style_context_new();
+gtk_style_context_set_screen( pCStyle, gtk_window_get_screen( GTK_WINDOW( 
mpWindow ) ) );
+GtkWidgetPath *pCPath = gtk_widget_path_new();
+gtk_widget_path_append_type( pCPath, GTK_TYPE_TEXT_VIEW );
+gtk_widget_path_iter_add_class( pCPath, -1, GTK_STYLE_CLASS_VIEW );
+gtk_style_context_set_path( pCStyle, pCPath );
+gtk_widget_path_free( pCPath );
 GdkRGBA field_background_color;
-gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, 
field_background_color);
+gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_NORMAL, 
field_background_color);
+g_object_unref( pCStyle );
+
 ::Color aBackFieldColor = getColor( field_background_color );
-// FIXME: we really need some work getting the right style contexts.
-// it seems a window has a rather different background color from what we 
want.
-aBackFieldColor = ::Color( COL_WHITE );
 aStyleSet.SetFieldColor( aBackFieldColor );
 // This baby is the default page/paper color
 aStyleSet.SetWindowColor( aBackFieldColor );
+}
 
 // highlighting colors
 gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED, 
text_color);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sfx2/source sw/source writerfilter/source

2012-04-14 Thread Caolán McNamara 
 sfx2/source/doc/objstor.cxx  |2 
 sw/source/core/docnode/ndtbl.cxx |   10 
 sw/source/core/unocore/unotext.cxx   |4 +
 sw/source/core/view/viewsh.cxx   |   32 ---
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 
 writerfilter/source/rtftok/rtftokenizer.cxx  |   10 
 6 files changed, 43 insertions(+), 17 deletions(-)

New commits:
commit 234f150f30d881b2691288c5f5581306bd4d3d18
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Apr 14 12:45:38 2012 +0100

Resolves: fdo#48640 handle various busted rtf docs without hanging

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e42df41..d8406dc 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2236,7 +2236,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium rMedium, 
bool bInsert )
 }
 
 return xLoader-filter( aArgs );
-}catch(const uno::Exception)
+}catch(...)
 {}
 }
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0817150..7be23f3 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange 
rRange, sal_Unicode cCh,
 
 const SwTable* SwDoc::TextToTable( const std::vector std::vectorSwNodeRange 
 rTableNodes )
 {
+if (rTableNodes.empty())
+return NULL;
+
+std::vectorSwNodeRange rFirstRange = *rTableNodes.begin();
+
+if (rFirstRange.empty())
+return NULL;
+
 /* Save first node in the selection if it is a content node. */
-SwCntntNode * pSttCntntNd = 
rTableNodes.begin()-begin()-aStart.GetNode().GetCntntNode();
+SwCntntNode * pSttCntntNd = 
rFirstRange.begin()-aStart.GetNode().GetCntntNode();
 
 /**debug**/
 #if OSL_DEBUG_LEVEL  1
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 08e6ce5..2334391 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2230,6 +2230,10 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 std::vectorVerticallyMergedCell aMergedCells;
 
 SwTable const*const pTable = m_pImpl-m_pDoc-TextToTable( aTableNodes );
+
+if (!pTable)
+return uno::Reference text::XTextTable ();
+
 SwXTextTable *const pTextTable = new SwXTextTable( *pTable-GetFrmFmt() );
 const uno::Reference text::XTextTable  xRet = pTextTable;
 const uno::Reference beans::XPropertySet  xPrSet = pTextTable;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 17b48da..89a71f1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction()
 double nFullWidth = m_nTableWidth;
 //the positions have to be distibuted in a range of 1
 const double nFullWidthRelative = 1.;
-if( pTableGrid-size() == nGrids )
+if( pTableGrid-size() == nGrids  m_nCell  0 )
 {
 uno::Sequence text::TableColumnSeparator  aSeparators( m_nCell - 1 );
 text::TableColumnSeparator* pSeparators = aSeparators.getArray();
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index d6dc3ca..125319e 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword()
 {
 aBuf.append(ch);
 Strm()  ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
 }
 if (aBuf.getLength()  32)
 // See RTF spec v1.9.1, page 7
@@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword()
 {
 aParameter.append(ch);
 Strm()  ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
 }
 nParam = aParameter.makeStringAndClear().toInt32();
 if (bNeg)
commit 1856186951a70a0bcac4e0c3632ca4afe68c05e3
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Apr 14 07:56:45 2012 +0100

optimize: traverse children with WINDOW_FIRSTCHILD/WINDOW_NEXT

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 774000c..04717dd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -370,25 +370,29 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
 if ( GetWin() )
 {
 Window rWindow = *(GetWin());
-if(rWindow.IsChildTransparentModeEnabled()  
rWindow.GetChildCount())
+if (rWindow.IsChildTransparentModeEnabled())

[Libreoffice-commits] .: 3 commits - codemaker/codemaker.pmk codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/inc codemaker/Makefile codemaker/Module_codemaker.mk codemake

2012-04-14 Thread Norbert Thiebaud 
 Makefile |4 -
 Repository.mk|   13 
 RepositoryModule_ooo.mk  |2 
 codemaker/Executable_cppumaker.mk|   59 +
 codemaker/Executable_javamaker.mk|   52 +++
 codemaker/Makefile   |7 ++
 codemaker/Module_codemaker.mk|   38 ++
 codemaker/Package_inc.mk |   41 +++
 codemaker/StaticLibrary_codemaker.mk |   45 
 codemaker/StaticLibrary_codemaker_cpp.mk |   39 ++
 codemaker/StaticLibrary_codemaker_java.mk|   39 ++
 codemaker/codemaker.pmk  |   49 --
 codemaker/inc/makefile.mk|   40 --
 codemaker/prj/build.lst  |   10 ---
 codemaker/prj/d.lst  |   14 -
 codemaker/prj/makefile.mk|1 
 codemaker/source/codemaker/makefile.mk   |   49 --
 codemaker/source/commoncpp/makefile.mk   |   42 ---
 codemaker/source/commonjava/makefile.mk  |   42 ---
 codemaker/source/cppumaker/makefile.mk   |   73 ---
 codemaker/source/javamaker/makefile.mk   |   66 
 unodevtools/Executable_skeletonmaker.mk  |   64 +++
 unodevtools/Makefile |7 ++
 unodevtools/Module_unodevtools.mk|   33 
 unodevtools/prj/build.lst|8 --
 unodevtools/prj/d.lst|5 -
 unodevtools/prj/makefile.mk  |1 
 unodevtools/source/skeletonmaker/makefile.mk |   63 ---
 unodevtools/source/unodevtools/makefile.mk   |   52 ---
 unodevtools/unodevtools.pmk  |   55 
 30 files changed, 447 insertions(+), 566 deletions(-)

New commits:
commit b60bf1eb625e4d2e94543a90770cea9214352b63
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Apr 14 05:31:32 2012 -0500

rename common* static libs to codemaker_* for clarity + dmake cleanup

diff --git a/Repository.mk b/Repository.mk
index bc229c9..e46f6b1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -561,8 +561,8 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 basegfx_s \
 codemaker \
-commoncpp \
-commonjava \
+codemaker_cpp \
+codemaker_java \
 dtobj \
 headless \
 libeay32 \
diff --git a/codemaker/Executable_cppumaker.mk 
b/codemaker/Executable_cppumaker.mk
index f4dbdc6..69293e2 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,cppumaker,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,cppumaker,\
-commoncpp \
+codemaker_cpp \
 codemaker \
 ))
 
diff --git a/codemaker/Executable_javamaker.mk 
b/codemaker/Executable_javamaker.mk
index 5633acb..cd5a1aa 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Executable_use_libraries,javamaker,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,javamaker,\
-commonjava \
+codemaker_java \
 codemaker \
 ))
 
diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 2594cc3..d2b6060 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -29,8 +29,8 @@ $(eval $(call gb_Module_Module,codemaker))
 $(eval $(call gb_Module_add_targets,codemaker,\
 Package_inc \
 StaticLibrary_codemaker \
-StaticLibrary_commoncpp \
-StaticLibrary_commonjava \
+StaticLibrary_codemaker_cpp \
+StaticLibrary_codemaker_java \
 Executable_javamaker \
 Executable_cppumaker \
 ))
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk 
b/codemaker/StaticLibrary_codemaker_cpp.mk
new file mode 100644
index 000..3f18114
--- /dev/null
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see

[Libreoffice-commits] .: 2 commits - l10ntools/inc l10ntools/scripts l10ntools/source scp2/source

2012-04-14 Thread Andras Timar 
 l10ntools/inc/export.hxx|1 +
 l10ntools/scripts/po2lo |2 +-
 l10ntools/source/cfgmerge.cxx   |4 +++-
 l10ntools/source/export.cxx |4 ++--
 scp2/source/ooo/module_langpack.ulf |2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3f00358bfdad0a18fe053c3d154f74e3aa6afba9
Author: Andras Timar ati...@suse.com
Date:   Sat Apr 14 14:22:13 2012 +0200

export x-comments to sdf file into the 'helptext' field

helptext field has not been in use for a while, so we can
use that to hold the x-comment

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 760a745..bf1809b 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -72,6 +72,7 @@ typedef boost::unordered_maprtl::OString, MergeData*, 
rtl::OStringHash
 MergeDataHashMap;
 
 #define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US))
+#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM(x-comment))
 #define LIST_REFID  LIST_REFID
 
 typedef OStringHashMap ExportListEntry;
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index 4bcfb8b..cdf8892 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -51,7 +51,7 @@ class Entry:
 prefix += %s. % self.items[3]
 self.keys = []
 # 10..13 are translation types
-for idx in range(10, 14):
+for idx in [10,12,13]:
 try:
 if len(self.items[idx]):
 t = {10:'text', 12:'quickhelptext', 13:'title'}[idx]
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 2c39fc6..b8f6c19 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -483,6 +483,7 @@ void CfgExport::WorkOnRessourceEnd()
 if ( 
pStackData-sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US))].getLength()
 )
 {
 rtl::OString sFallback = 
pStackData-sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US))];
+rtl::OString sXComment = 
pStackData-sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM(x-comment))];
 rtl::OString sLocalId = pStackData-sIdentifier;
 rtl::OString sGroupId;
 if ( aStack.size() == 1 ) {
@@ -512,7 +513,8 @@ void CfgExport::WorkOnRessourceEnd()
 sOutput += sCur;
 sOutput += \t;
 
-sOutput += sText; sOutput += \t\t\t\t;
+sOutput += sText; sOutput += \t;
+sOutput += sXComment; sOutput += \t\t\t;
 
 pOutputStream  sOutput.getStr()  '\n';
 }
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 60c4a73..329fd19 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1006,8 +1006,8 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool 
bCreateNew )
 sXText = pResData-sText[ SOURCE_LANGUAGE ];
 }
 
-if (!pResData-sHelpText[ sCur ].isEmpty())
-sXHText = pResData-sHelpText[ sCur ];
+if (!pResData-sText[ X_COMMENT ].isEmpty())
+sXHText = pResData-sText[ X_COMMENT ];
 else {
 sXHText = pResData-sHelpText[ SOURCE_LANGUAGE ];
 }
commit af0e727b5dfcdea0555748e7e6415d70fe7665a9
Author: Andras Timar ati...@suse.com
Date:   Sat Apr 14 14:19:56 2012 +0200

fix a typo (BN instead of BN_IN)

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index fa598e9..d321988 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -268,7 +268,7 @@ en-US = Installs the Bengali (Bangladesh) user interface
 [STR_NAME_MODULE_LANGPACK_BN_IN]
 en-US = Bengali (India)
 
-[STR_DESC_MODULE_LANGPACK_BN]
+[STR_DESC_MODULE_LANGPACK_BN_IN]
 en-US = Installs the Bengali (India) user interface
 
 [STR_NAME_MODULE_LANGPACK_OR]
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-04-14 Thread Caolán McNamara 
 sc/source/core/data/dpitemdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23067849649518210ee0fdf80fa4b05625f1e6bb
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Apr 14 13:46:07 2012 +0100

valgrind: Conditional jump or move depends on uninitialised value

in ScDPItemData::DisposeString

diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index c6fc2dd..83ca357 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -125,7 +125,7 @@ ScDPItemData::ScDPItemData(const rtl::OUString* pStr) :
 mpString(pStr), meType(String), mbStringInterned(true) {}
 
 ScDPItemData::ScDPItemData(sal_Int32 nGroupType, sal_Int32 nValue) :
-meType(GroupValue)
+meType(GroupValue), mbStringInterned(false)
 {
 maGroupValue.mnGroupType = nGroupType;
 maGroupValue.mnValue = nValue;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/CppunitTest_sc_filters_test.mk

2012-04-14 Thread Markus Mohrhard 
 sc/CppunitTest_sc_filters_test.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ad0f3a4139f7cfde39222cc575e86f3d3343896
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Apr 14 14:48:14 2012 +0200

blind fix for Norbert's tinderbox

diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index df24d15..da56cb8 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -118,7 +118,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sc_filters_test,\
 unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/CppunitTest_sc_filters_test.mk

2012-04-14 Thread Markus Mohrhard 
 sc/CppunitTest_sc_filters_test.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3bdb2288957120cc4bd958c36a4d4db22e7343f0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Apr 14 15:34:20 2012 +0200

Revert blind fix for Norbert's tinderbox

This reverts commit 7ad0f3a4139f7cfde39222cc575e86f3d3343896.

diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index da56cb8..df24d15 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -118,7 +118,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sc_filters_test,\
 unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
+$(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - filter/Executable_svg2odf.mk filter/inc filter/Library_svgfilter.mk filter/Module_filter.mk filter/source framework/source Repository.mk

2012-04-14 Thread Jan Holesovsky 
 Repository.mk |1 
 filter/Executable_svg2odf.mk  |   47 
 filter/Library_svgfilter.mk   |5 ++
 filter/Module_filter.mk   |1 
 filter/inc/filter/dllapi.h|   49 ++
 filter/source/svg/svgreader.hxx   |6 ++-
 framework/source/uielement/toolbarmanager.cxx |   22 +--
 7 files changed, 110 insertions(+), 21 deletions(-)

New commits:
commit 2a63c47b5b60551d44ee20983fd422d502e29be4
Author: Jan Holesovsky ke...@suse.cz
Date:   Sat Apr 14 15:35:12 2012 +0200

Build svg2odf tool to be able to test the svg import.

diff --git a/Repository.mk b/Repository.mk
index e46f6b1..f0c5965 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 saxparser \
 so_checksum \
 sp2bv \
+svg2odf \
 svidl \
 typesconfig \
 xml2cmp \
diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
new file mode 100644
index 000..794edb9
--- /dev/null
+++ b/filter/Executable_svg2odf.mk
@@ -0,0 +1,47 @@
+# -*- 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Jan Holesovsky ke...@suse.cz, SUSE
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Executable_Executable,svg2odf))
+
+$(eval $(call gb_Executable_set_targettype_gui,svg2odf,YES))
+
+$(eval $(call gb_Executable_use_api,svg2odf,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,svg2odf,\
+svgfilter \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_cxxobjects,svg2odf,\
+filter/source/svg/test/svg2odf \
+filter/source/svg/test/odfserializer \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index b5ebe23..c37938f 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -27,6 +27,11 @@ $(eval $(call gb_Library_add_defs,svgfilter,\
-DUSE_MODERN_SPIRIT \
 ))
 
+$(eval $(call gb_Library_set_include,svgfilter,\
+$$(INCLUDE) \
+-I$(SRCDIR)/filter/inc \
+))
+
 $(eval $(call gb_Library_use_api,svgfilter,\
udkapi \
offapi \
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 9bcfe3b..03f13e2 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,filter,\
AllLangResTarget_xsltdlg \
Configuration_filter \
CustomTarget_svg \
+   Executable_svg2odf \
Library_PptImporter \
Library_egi \
Library_eme \
diff --git a/filter/inc/filter/dllapi.h b/filter/inc/filter/dllapi.h
new file mode 100644
index 000..16ff305
--- /dev/null
+++ b/filter/inc/filter/dllapi.h
@@ -0,0 +1,49 @@
+/* -*- 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
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3

[Libreoffice-commits] .: filter/Module_filter.mk

2012-04-14 Thread Jan Holesovsky 
 filter/Module_filter.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c0a3ff4ad85a3ecdc6b8589c3a8b3c19f199b02e
Author: Jan Holesovsky ke...@suse.cz
Date:   Sat Apr 14 15:50:03 2012 +0200

Temporarily disable the build of svg2odf.

diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 03f13e2..9bcfe3b 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,filter,\
AllLangResTarget_xsltdlg \
Configuration_filter \
CustomTarget_svg \
-   Executable_svg2odf \
Library_PptImporter \
Library_egi \
Library_eme \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/Executable_svg2odf.mk filter/Module_filter.mk

2012-04-14 Thread Jan Holesovsky 
 filter/Executable_svg2odf.mk |5 +
 filter/Module_filter.mk  |1 +
 2 files changed, 6 insertions(+)

New commits:
commit 3c0f54a41a63cd0a56cfa0faf40605c5b27dd99e
Author: Jan Holesovsky ke...@suse.cz
Date:   Sat Apr 14 16:03:10 2012 +0200

Make svg2odf really build :-)

diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index 794edb9..f902dba 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -34,6 +34,11 @@ $(eval $(call gb_Executable_use_api,svg2odf,\
 udkapi \
 ))
 
+$(eval $(call gb_Executable_set_include,svg2odf,\
+$$(INCLUDE) \
+-I$(SRCDIR)/filter/inc \
+))
+
 $(eval $(call gb_Executable_use_libraries,svg2odf,\
 svgfilter \
 $(gb_STDLIBS) \
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 9bcfe3b..03f13e2 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,filter,\
AllLangResTarget_xsltdlg \
Configuration_filter \
CustomTarget_svg \
+   Executable_svg2odf \
Library_PptImporter \
Library_egi \
Library_eme \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/Executable_svg2odf.mk

2012-04-14 Thread Jan Holesovsky 
 filter/Executable_svg2odf.mk |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit a167ce5d91f87326093cbcdb44cde1527ef6849c
Author: Chr. Rossmanith chr.rossman...@gmx.de
Date:   Sat Apr 14 16:18:32 2012 +0200

gbuild for svg2odf

diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index f902dba..329ca8e 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -41,7 +41,21 @@ $(eval $(call gb_Executable_set_include,svg2odf,\
 
 $(eval $(call gb_Executable_use_libraries,svg2odf,\
 svgfilter \
-$(gb_STDLIBS) \
+   svxcore \
+   editeng \
+   xo \
+   svt \
+   vcl \
+   svl \
+   utl \
+   tl \
+   sax \
+   comphelper \
+   basegfx \
+   cppuhelper \
+   cppu \
+   sal \
+   $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_cxxobjects,svg2odf,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa writerfilter/source

2012-04-14 Thread Miklos Vajna 
 sw/qa/extras/ooxmltok/data/n750935.docx |binary
 sw/qa/extras/ooxmltok/ooxmltok.cxx  |   14 ++
 writerfilter/source/dmapper/PropertyMap.cxx |   11 +--
 3 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 0ef7dbcb365534c4203760c86d089d50f7eb9562
Author: Miklos Vajna vmik...@suse.cz
Date:   Sat Apr 14 16:11:46 2012 +0200

dmapper: fix import of odd/even page breaks

diff --git a/sw/qa/extras/ooxmltok/data/n750935.docx 
b/sw/qa/extras/ooxmltok/data/n750935.docx
new file mode 100644
index 000..0dd0159
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n750935.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 5beb577..5aff21c 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -31,7 +31,9 @@
 #include com/sun/star/text/SetVariableType.hpp
 #include com/sun/star/text/TextContentAnchorType.hpp
 #include com/sun/star/text/XDependentTextField.hpp
+#include com/sun/star/text/XPageCursor.hpp
 #include com/sun/star/text/XTextFieldsSupplier.hpp
+#include com/sun/star/text/XTextViewCursorSupplier.hpp
 
 #include test/bootstrapfixture.hxx
 #include unotest/macros_test.hxx
@@ -50,12 +52,14 @@ public:
 void testN751054();
 void testN751117();
 void testN751017();
+void testN750935();
 
 CPPUNIT_TEST_SUITE(OoxmlModelTest);
 #if !defined(MACOSX)  !defined(WNT)
 CPPUNIT_TEST(testN751054);
 CPPUNIT_TEST(testN751117);
 CPPUNIT_TEST(testN751017);
+CPPUNIT_TEST(testN750935);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -171,6 +175,16 @@ void OoxmlModelTest::testN751017()
 CPPUNIT_ASSERT(bFoundGet);
 }
 
+void OoxmlModelTest::testN750935()
+{
+load(n750935.docx);
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(5), xCursor-getPage());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(OoxmlModelTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 471f9b8..3f6b18c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -39,6 +39,7 @@
 #include com/sun/star/container/XEnumerationAccess.hpp
 #include com/sun/star/container/XNameContainer.hpp
 #include com/sun/star/style/BreakType.hpp
+#include com/sun/star/style/PageStyleLayout.hpp
 #include com/sun/star/text/RelOrientation.hpp
 #include com/sun/star/text/WritingMode.hpp
 #include com/sun/star/text/XTextColumns.hpp
@@ -974,8 +975,14 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl rDM_Impl )
 0 - No break 1 - New Colunn 2 - New page 3 - Even page 4 - odd 
page */
 xRangeProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_PAGE_DESC_NAME ),
 uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : 
m_sFollowPageStyleName ));
-//  todo: page breaks with odd/even page numbering are not available - 
find out current page number to check how to change the number
-//  or add even/odd page break types
+// handle page breaks with odd/even page numbering
+style::PageStyleLayout nPageStyleLayout;
+if (m_nBreakType == 3)
+nPageStyleLayout = style::PageStyleLayout_LEFT;
+else if (m_nBreakType == 4)
+nPageStyleLayout = style::PageStyleLayout_RIGHT;
+if (nPageStyleLayout)
+xFollowPageStyle-setPropertyValue(PageStyleLayout, 
uno::makeAny(nPageStyleLayout));
 if(m_bPageNoRestart || m_nPageNumber = 0)
 {
 sal_Int16 nPageNumber = m_nPageNumber = 0 ? static_cast 
sal_Int16 (m_nPageNumber) : 1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2012-04-14 Thread Miklos Vajna 
 writerfilter/source/dmapper/PropertyIds.cxx |1 +
 writerfilter/source/dmapper/PropertyIds.hxx |1 +
 writerfilter/source/dmapper/PropertyMap.cxx |2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fd1bef82a99de423005e1dfaf2935823a1fc74bd
Author: Miklos Vajna vmik...@suse.cz
Date:   Sat Apr 14 16:52:36 2012 +0200

dmapper: use PropNameSupplier in SectionPropertyMap::CloseSectionGroup()

diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 64f562a..f1835c3 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -322,6 +322,7 @@ const rtl::OUString PropertyNameSupplier::GetName( 
PropertyIds eId ) const
 case PROP_FRM_DIRECTION:sName = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FRMDirection)); break;
 case PROP_EMBEDDED_OBJECT   :sName = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EmbeddedObject)); break;
 case PROP_IS_VISIBLE: sName = IsVisible; break;
+case PROP_PAGE_STYLE_LAYOUT: sName = PageStyleLayout; break;
 }
 ::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
 m_pImpl-aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index c6e5369..330c1d9 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -295,6 +295,7 @@ enum PropertyIds
 /*253*/ ,PROP_FRM_DIRECTION
 ,PROP_EMBEDDED_OBJECT
 ,PROP_PARA_CONTEXT_MARGIN
+,PROP_PAGE_STYLE_LAYOUT
 };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 3f6b18c..72b92b3 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -982,7 +982,7 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl rDM_Impl )
 else if (m_nBreakType == 4)
 nPageStyleLayout = style::PageStyleLayout_RIGHT;
 if (nPageStyleLayout)
-xFollowPageStyle-setPropertyValue(PageStyleLayout, 
uno::makeAny(nPageStyleLayout));
+
xFollowPageStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_STYLE_LAYOUT),
 uno::makeAny(nPageStyleLayout));
 if(m_bPageNoRestart || m_nPageNumber = 0)
 {
 sal_Int16 nPageNumber = m_nPageNumber = 0 ? static_cast 
sal_Int16 (m_nPageNumber) : 1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/source

2012-04-14 Thread Julien Nabet 
 editeng/source/editeng/impedit3.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 95cc5de63b20c5986fe8f3913da86002eabd7cb1
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Apr 14 18:06:08 2012 +0200

Resolves: fdo#48683 nice crash when hitting DEL

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 0d6877b..5ea5d71 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2436,7 +2436,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* 
pParaPortion, sal_uInt16 nSt
 // Remove portion;
 sal_uInt8 nType = pTP-GetKind();
 pParaPortion-GetTextPortions().Remove( nPortion );
-delete pTP;
 if ( nType == PORTIONKIND_LINEBREAK )
 {
 TextPortion* pNext = pParaPortion-GetTextPortions()[ nPortion 
];
@@ -2444,7 +2443,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* 
pParaPortion, sal_uInt16 nSt
 {
 // Remove dummy portion
 pParaPortion-GetTextPortions().Remove( nPortion );
-delete pNext;
 }
 }
 }
@@ -2462,7 +2460,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* 
pParaPortion, sal_uInt16 nSt
 {
 // Discard portion; if possible, correct the ones before,
 // if the Hyphenator portion has swallowed one character...
-pParaPortion-GetTextPortions().Remove( nLastPortion );
 if ( nLastPortion  pTP-GetLen() )
 {
 TextPortion* pPrev = 
pParaPortion-GetTextPortions()[nLastPortion - 1];
@@ -2470,7 +2467,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* 
pParaPortion, sal_uInt16 nSt
 pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
 pPrev-GetSize().Width() = (-1);
 }
-delete pTP;
+pParaPortion-GetTextPortions().Remove( nLastPortion );
 }
 }
 #if OSL_DEBUG_LEVEL  2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - postprocess/packregistry

2012-04-14 Thread David Tardon 
 postprocess/packregistry/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d041f609f330ff30db2a54e38e91e3def1d7d053
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 18:26:59 2012 +0200

fix file name

diff --git a/postprocess/packregistry/makefile.mk 
b/postprocess/packregistry/makefile.mk
index 1a8e873..826aa8c 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -331,7 +331,7 @@ ERROR : unknown-GUIBASE
 .END
 .IF $(ENABLE_EVOAB2) == TRUE
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab.xcu
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 MY_DRIVERS += evoab
 .END
 .IF $(SOLAR_JAVA) == TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - postprocess/packregistry

2012-04-14 Thread David Tardon 
 postprocess/packregistry/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96de6e6890ae7234a023c34674affaeb339681eb
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 18:37:25 2012 +0200

fix file name (part 2)

diff --git a/postprocess/packregistry/makefile.mk 
b/postprocess/packregistry/makefile.mk
index 826aa8c..8624146 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -330,7 +330,7 @@ MY_DRIVERS += ado
 ERROR : unknown-GUIBASE
 .END
 .IF $(ENABLE_EVOAB2) == TRUE
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 MY_DRIVERS += evoab
 .END
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-04-14 Thread Eike Rathke 
 sc/source/ui/docshell/impex.cxx |  164 +++-
 sc/source/ui/inc/impex.hxx  |   17 +---
 2 files changed, 151 insertions(+), 30 deletions(-)

New commits:
commit 7928b651965f747b02593d2a9fc73fac7c86dbf5
Author: Eike Rathke er...@redhat.com
Date:   Sat Apr 14 18:57:31 2012 +0200

resolved fdo#48621 better handling of broken CSV files

* non-escaped (not doubled) quotes in quoted strings are regarded as broken
  representation and are taken literally, only a quote followed by a 
separator
  ends a field. If not being a separator themselves, trailing blanks between
  the ending quote and the separator are ignored, complementary to leading
  blanks between a separator and a quote.
* quotes in a non-quoted string are taken literally

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index f33a0d7..cf51c07 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -573,6 +573,77 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream 
rStrm )
 }
 
 
+enum QuoteType
+{
+FIELDSTART_QUOTE,
+FIRST_QUOTE,
+SECOND_QUOTE,
+FIELDEND_QUOTE,
+DONTKNOW_QUOTE
+};
+
+
+/** Determine if *p is a quote that ends a quoted field.
+
+Precondition: we are parsing a quoted field already and *p is a quote.
+
+@return
+FIELDEND_QUOTE if end of field quote
+DONTKNOW_QUOTE anything else
+ */
+static QuoteType lcl_isFieldEndQuote( const sal_Unicode* p, const sal_Unicode* 
pSeps )
+{
+// Due to broken CSV generators that don't double embedded quotes check if
+// a field separator immediately or with trailing spaces follows the quote,
+// only then end the field, or at end of string.
+while (p[1] == ' ')
+++p;
+if (!p[1] || ScGlobal::UnicodeStrChr( pSeps, p[1]))
+return FIELDEND_QUOTE;
+return DONTKNOW_QUOTE;
+}
+
+
+/** Determine if *p is a quote that is escaped by being doubled or ends a
+quoted field.
+
+Precondition: *p is a quote.
+
+@param nQuotes
+Quote characters encountered so far.
+Odd (after opening quote) means either no embedded quotes or only quote
+pairs so far.
+Even means either not in a quoted field or already one quote
+encountered, the first of a pair.
+
+@return
+FIELDSTART_QUOTE if first quote in a field, either starting content or
+embedded so caller should check beforehand.
+FIRST_QUOTE  if first of a doubled quote
+SECOND_QUOTE if second of a doubled quote
+FIELDEND_QUOTE   if end of field quote
+DONTKNOW_QUOTE   if an unescaped quote we don't consider as end of 
field,
+do not increment nQuotes in caller then!
+ */
+static QuoteType lcl_isEscapedOrFieldEndQuote( sal_Int32 nQuotes, const 
sal_Unicode* p,
+const sal_Unicode* pSeps, sal_Unicode cStr )
+{
+if ((nQuotes % 2) == 0)
+{
+if (p[-1] == cStr)
+return SECOND_QUOTE;
+else
+{
+SAL_WARN( sc, lcl_isEscapedOrFieldEndQuote: really want a 
FIELDSTART_QUOTE?);
+return FIELDSTART_QUOTE;
+}
+}
+if (p[1] == cStr)
+return FIRST_QUOTE;
+return lcl_isFieldEndQuote( p, pSeps);
+}
+
+
 /** Append characters of [p1,p2) to rField.
 
 @returns TRUE if ok; FALSE if data overflow, truncated
@@ -606,7 +677,7 @@ enum DoubledQuoteMode
 };
 
 static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String 
rString,
-sal_Unicode cStr, DoubledQuoteMode eMode, bool rbOverflowCell )
+const sal_Unicode* pSeps, sal_Unicode cStr, DoubledQuoteMode 
eMode, bool rbOverflowCell )
 {
 p++;//! jump over opening quote
 bool bCont;
@@ -621,7 +692,18 @@ static const sal_Unicode* lcl_ScanString( const 
sal_Unicode* p, String rString,
 if( *p == cStr )
 {
 if ( *++p != cStr )
-break;
+{
+// break or continue for loop
+if (eMode == DQM_ESCAPE)
+{
+if (lcl_isFieldEndQuote( p-1, pSeps) == FIELDEND_QUOTE)
+break;
+else
+continue;
+}
+else
+break;
+}
 // doubled quote char
 switch ( eMode )
 {
@@ -815,6 +897,10 @@ bool ScImportExport::Text2Doc( SvStream rStrm )
 {
 bool bOk = true;
 
+sal_Unicode pSeps[2];
+pSeps[0] = cSep;
+pSeps[1] = 0;
+
 SCCOL nStartCol = aRange.aStart.Col();
 SCROW nStartRow = aRange.aStart.Row();
 SCCOL nEndCol = aRange.aEnd.Col();
@@ -843,7 +929,7 @@ bool ScImportExport::Text2Doc( SvStream rStrm )
 aCell.Erase();
 if( *p == cStr )
 {

[Libreoffice-commits] .: 3 commits - vcl/source vcl/win

2012-04-14 Thread Ivan Timofeev 
 vcl/source/window/menu.cxx   |5 -
 vcl/win/source/gdi/salnativewidgets-luna.cxx |   21 +
 2 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 3a603d376a2bc2b839be3b89a8ecf8df1c42260b
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Apr 14 20:51:20 2012 +0400

vcl: win: adjust some coordinates

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 3b0051a..888b1a7 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -986,7 +986,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 RECT aGutterRC = rc;
 if( Application::GetSettings().GetLayoutRTL() )
 {
-aGutterRC.right -= aValue.getNumericVal();
+aGutterRC.right -= aValue.getNumericVal()+1;
 aGutterRC.left = aGutterRC.right-3;
 }
 else
@@ -1043,9 +1043,9 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 {
 // adjust for gutter position
 if( Application::GetSettings().GetLayoutRTL() )
-rc.right -= aValue.getNumericVal();
+rc.right -= aValue.getNumericVal()+1;
 else
-rc.left += aValue.getNumericVal();
+rc.left += aValue.getNumericVal()+1;
 Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
 MENU_POPUPSEPARATOR, 0, Rectangle( rc.left, rc.top, 
rc.right, rc.bottom ) ) );
 // center the separator inside the passed rectangle
commit 7179a362dd5788c4c4f7197d15abfa17e0cad584
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Apr 14 20:48:11 2012 +0400

vcl: win: fix RTL checkmark backgrounds fdo#42537

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index bcf80cd..3b0051a 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1015,13 +1015,18 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 if( aValue.getType() == CTRL_MENU_POPUP )
 {
 const MenupopupValue rMVal( static_castconst 
MenupopupValue(aValue) );
-aBGRect.left   = rMVal.maItemRect.Left();
 aBGRect.top= rMVal.maItemRect.Top();
 aBGRect.bottom = rMVal.maItemRect.Bottom()+1; // see 
below in drawNativeControl
-aBGRect.right  = rMVal.getNumericVal();
-
-// FIXME: magic
-aBGRect.left += 1; aBGRect.top += 1; aBGRect.bottom 
+=1;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aBGRect.right = rMVal.maItemRect.Right()+1;
+aBGRect.left = aBGRect.right - 
(rMVal.getNumericVal()-rMVal.maItemRect.Left());
+}
+else
+{
+aBGRect.right = rMVal.getNumericVal();
+aBGRect.left  = rMVal.maItemRect.Left();
+}
 }
 iState = (nState  CTRL_STATE_ENABLED) ? MCB_NORMAL : 
MCB_DISABLED;
 ImplDrawTheme( hTheme, hDC, MENU_POPUPCHECKBACKGROUND, 
iState, aBGRect, aCaption );
commit 532904765073c827bed3181d97c217909db1843f
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Apr 14 20:42:23 2012 +0400

vcl: hack: pData-aSz.Width() is set only for MenuBar, use aOutSz.Width()

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 73283f3..eaca00d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2751,7 +2751,10 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, 
long nStartY, MenuItemDa
 aTmpPos.Y() = aOuterCheckRect.Top() + 
(aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
 
 Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, 
nCtrlHeight ) );
-MenupopupValue aVal( nTextPos-GUTTERBORDER, 
Rectangle( aPos, pData-aSz ) );
+Size aSz( pData-aSz );
+aSz.Width() = aOutSz.Width() - 2*nOuterSpace;
+Rectangle aItemRect( aPos, aSz );
+MenupopupValue aVal( nTextPos-GUTTERBORDER, 
aItemRect );
 pWin-DrawNativeControl( CTRL_MENU_POPUP, nPart,
  aCheckRect,
  nState,
___
Libreoffice-commits mailing list

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

2012-04-14 Thread Miklos Vajna 
 sfx2/source/doc/objstor.cxx  |2 +-
 sw/source/core/docnode/ndtbl.cxx |   10 +-
 sw/source/core/unocore/unotext.cxx   |4 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +-
 writerfilter/source/rtftok/rtftokenizer.cxx  |   10 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit 51c8c95b2864b49e7bcbd824eacedb5778a758c0
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Apr 14 12:45:38 2012 +0100

Resolves: fdo#48640 handle various busted rtf docs without hanging

(cherry picked from commit 234f150f30d881b2691288c5f5581306bd4d3d18)

Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b652fe6..7a43904 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2238,7 +2238,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium rMedium, 
bool bInsert )
 }
 
 return xLoader-filter( aArgs );
-}catch(const uno::Exception)
+}catch(...)
 {}
 }
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index ba7581f..981f3c3 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange 
rRange, sal_Unicode cCh,
 
 const SwTable* SwDoc::TextToTable( const std::vector std::vectorSwNodeRange 
 rTableNodes )
 {
+if (rTableNodes.empty())
+return NULL;
+
+std::vectorSwNodeRange rFirstRange = *rTableNodes.begin();
+
+if (rFirstRange.empty())
+return NULL;
+
 /* Save first node in the selection if it is a content node. */
-SwCntntNode * pSttCntntNd = 
rTableNodes.begin()-begin()-aStart.GetNode().GetCntntNode();
+SwCntntNode * pSttCntntNd = 
rFirstRange.begin()-aStart.GetNode().GetCntntNode();
 
 /**debug**/
 #if OSL_DEBUG_LEVEL  1
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 71939e4..bd356da 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2231,6 +2231,10 @@ throw (lang::IllegalArgumentException, 
uno::RuntimeException)
 std::vectorVerticallyMergedCell aMergedCells;
 
 SwTable const*const pTable = m_pImpl-m_pDoc-TextToTable( aTableNodes );
+
+if (!pTable)
+return uno::Reference text::XTextTable ();
+
 SwXTextTable *const pTextTable = new SwXTextTable( *pTable-GetFrmFmt() );
 const uno::Reference text::XTextTable  xRet = pTextTable;
 const uno::Reference beans::XPropertySet  xPrSet = pTextTable;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 2331e57..b4aaf3d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction()
 double nFullWidth = m_nTableWidth;
 //the positions have to be distibuted in a range of 1
 const double nFullWidthRelative = 1.;
-if( pTableGrid-size() == nGrids )
+if( pTableGrid-size() == nGrids  m_nCell  0 )
 {
 uno::Sequence text::TableColumnSeparator  aSeparators( m_nCell - 1 );
 text::TableColumnSeparator* pSeparators = aSeparators.getArray();
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 897e316..8a0f155 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword()
 {
 aBuf.append(ch);
 Strm()  ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
 }
 if (aBuf.getLength()  32)
 // See RTF spec v1.9.1, page 7
@@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword()
 {
 aParameter.append(ch);
 Strm()  ch;
+if (Strm().IsEof())
+{
+ch = ' ';
+break;
+}
 }
 nParam = aParameter.makeStringAndClear().toInt32();
 if (bNeg)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/Library_presenter.mk sdext/source unusedcode.easy

2012-04-14 Thread Matus Kukan 
 sdext/Library_presenter.mk|2 
 sdext/source/presenter/PresenterAnimation.cxx |   75 ---
 sdext/source/presenter/PresenterAnimation.hxx |  110 -
 sdext/source/presenter/PresenterAnimator.cxx  |  139 --
 sdext/source/presenter/PresenterAnimator.hxx  |   69 --
 sdext/source/presenter/PresenterController.cxx|3 
 sdext/source/presenter/PresenterController.hxx|2 
 sdext/source/presenter/PresenterWindowManager.cxx |2 
 unusedcode.easy   |1 
 9 files changed, 403 deletions(-)

New commits:
commit 2d0e58e1fca4d098ecea1a3b0c0fe1447da99855
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Apr 14 16:21:40 2012 +0200

unusedcode: PresenterAnimation and PresenterAnimator

diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 7cefb48..c6232de 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,PresenterScreen,\
 
 $(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
 sdext/source/presenter/PresenterAccessibility \
-sdext/source/presenter/PresenterAnimation \
-sdext/source/presenter/PresenterAnimator \
 sdext/source/presenter/PresenterBitmapContainer \
 sdext/source/presenter/PresenterButton \
 sdext/source/presenter/PresenterCanvasHelper \
diff --git a/sdext/source/presenter/PresenterAnimation.cxx 
b/sdext/source/presenter/PresenterAnimation.cxx
deleted file mode 100644
index b5c30ec..000
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- 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
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include PresenterAnimation.hxx
-
-#include osl/time.h
-
-namespace sdext { namespace presenter {
-
-sal_uInt64 GetCurrentTime (void)
-{
-TimeValue aTimeValue;
-if (osl_getSystemTime(aTimeValue))
-return sal_uInt64(aTimeValue.Seconds * 1000.0 + aTimeValue.Nanosec / 
100.0);
-else
-return 0;
-}
-
-PresenterAnimation::PresenterAnimation (
-const sal_uInt64 nStartDelay,
-const sal_uInt64 nTotalDuration,
-const sal_uInt64 nStepDuration)
-: mnStartTime(GetCurrentTime()+nStartDelay),
-  mnTotalDuration(nTotalDuration),
-  mnStepDuration(nStepDuration)
-{
-}
-
-PresenterAnimation::~PresenterAnimation (void)
-{
-}
-
-sal_uInt64 PresenterAnimation::GetStartTime (void)
-{
-return mnStartTime;
-}
-
-sal_uInt64 PresenterAnimation::GetEndTime (void)
-{
-return mnStartTime + mnTotalDuration;
-}
-
-sal_uInt64 PresenterAnimation::GetStepDuration (void)
-{
-return mnStepDuration;
-}
-
-} } // end of namespace ::sdext::presenter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterAnimation.hxx 
b/sdext/source/presenter/PresenterAnimation.hxx
deleted file mode 100644
index 8c2ce42..000
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- 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

[Libreoffice-commits] .: 2 commits - sc/inc sc/qa

2012-04-14 Thread Eike Rathke 
 sc/inc/orcus/csv_parser.hpp|6 
 sc/qa/unit/data/contentCSV/fdo48621_broken_quotes_exported.csv |   90 
++
 sc/qa/unit/data/csv/fdo48621_broken_quotes.csv |   88 +
 sc/qa/unit/subsequent_filters-test.cxx |   33 +++
 4 files changed, 213 insertions(+), 4 deletions(-)

New commits:
commit d3b74479a7d0f6f02c86e72be14ae3880726ce59
Author: Eike Rathke er...@redhat.com
Date:   Sat Apr 14 20:22:56 2012 +0200

fix orcus to not fiddle with literal strings

diff --git a/sc/inc/orcus/csv_parser.hpp b/sc/inc/orcus/csv_parser.hpp
index 3e52bc1..77f8a3c 100644
--- a/sc/inc/orcus/csv_parser.hpp
+++ b/sc/inc/orcus/csv_parser.hpp
@@ -256,14 +256,14 @@ void csv_parser_Handler::quoted_cell()
 }
 
 // Closing quote.
-push_cell_value(p0, len-1);
+m_handler.cell(p0, len-1);
 next();
 skip_blanks();
 return;
 }
 
 // Stream ended prematurely.  Handle it gracefully.
-push_cell_value(p0, len);
+m_handler.cell(p0, len);
 next();
 skip_blanks();
 }
@@ -309,7 +309,7 @@ void csv_parser_Handler::parse_cell_with_quote(const 
char* p0, size_t len0)
 // buffer, push the value to the handler, and exit normally.
 append_to_cell_buf(p_cur, cur_len);
 
-push_cell_value(m_cell_buf[0], m_cell_buf_size);
+m_handler.cell(m_cell_buf[0], m_cell_buf_size);
 next();
 skip_blanks();
 return;
commit 1e94b35b3d8d25636a5dc6ad99f81399617ad105
Author: Eike Rathke er...@redhat.com
Date:   Sat Apr 14 20:22:55 2012 +0200

unit test for CSV import fixes related to fdo#48621

diff --git a/sc/qa/unit/data/contentCSV/fdo48621_broken_quotes_exported.csv 
b/sc/qa/unit/data/contentCSV/fdo48621_broken_quotes_exported.csv
new file mode 100644
index 000..b1c95af
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/fdo48621_broken_quotes_exported.csv
@@ -0,0 +1,90 @@
+i80358,,,
+abc d ef,shall be:,abc d ef,
+ab, a,shall be:,ab, a,
+,,,
+i78926_input.csv,,,
+2,5,GR010 015 
1001,/image/grimas/015/1001.jpg,/image/grimas/015/1001.jpg,/image/grimas/015/1001.jpg,5.45,0,-00-00
 00:00:00,-00-00 00:00:00,-00-00 
00:00:00,0.05,1,2,81,4,0,1,0,2000,0,0,0,0
+
+3,5,GR010 015 
1002,/image/grimas/015/1002.jpg,/image/grimas/015/1002.jpg,/image/grimas/015/1002.jpg,5.45,0,-00-00
 00:00:00,-00-00 00:00:00,-00-00 
00:00:00,0.05,1,2,81,4,0,0,0,2000,0,0,0,0
+
+,,,
+i78926_input.csv,,,
+772,3,SPAZZOLA ARIA BABYLISS 
32,image/APP.ELET/Varie/Babyliss-Spazzola-Elettrica.jpg,image/APP.ELET/Varie/Babyliss-Spazzola-Elettrica.jpg,image/APP.ELET/Varie/Babyliss-Spazzola-Elettrica.jpg,33,0,2006-11-07
 09:26:16,2007-05-24 17:54:24,NULL,1,1,2,86,150,0,0,0,2000,0,,,
+773,1,BIGODINI RISCALDANTI 
\BA,image/APP.ELET/Varie/Bigodini-caldi.jpg,image/APP.ELET/Varie/Bigodini-caldi.jpg,image/APP.ELET/Varie/Bigodini-caldi.jpg,57.91,0,2006-11-07
 09:26:16,2006-11-07 09:26:16,-00-00 
00:00:00,0.7,1,2,86,152,0,1,0,2000,0,0,0,0
+774,3,PIASTRA \BABYLISS\ PRO 
C,image/APP.ELET/piastre/Piastre-Babyliss-2564E.jpg,image/APP.ELET/piastre/Piastre-Babyliss-2564E.jpg,image/APP.ELET/piastre/Piastre-Babyliss-2564E.jpg,78,0,2006-11-07
 09:26:16,2006-12-13 19:18:31,-00-00 
00:00:00,0.7,1,2,86,148,0,0,0,2000,0,0,0,0
+775,0,PHON ULTRON MAXI 
2200W+1,image/APP.ELET/phon/Phon-Ultron-1500W.jpg,image/APP.ELET/phon/Phon-Ultron-1500W.jpg,image/APP.ELET/phon/Phon-Ultron-1500W.jpg,26.66,0,2006-11-07
 09:26:16,2006-12-13 18:57:03,-00-00 
00:00:00,0.7,1,2,101,158,0,0,0,2000,0,0,0,0
+,,,
+i78926_inconsistent_double_quote_behavior.csv,,,
+Description,Description,,
+The following text breaks everything,OpenOffice.org calc doesnt  like 
quotes embedded in fields.,,
+Here is some data,Here is some data,,
+Here is some data,Here is some data,,
+Here is some data,Here is some data,,
+Here is some data,Here is some data,,
+This field will fix everything,Here is the  
fix,,
+First fixed record,Here is some data,,
+Here is some data,Here is some data,,
+This field will break things again,Mismatched quote  must be after some 
quoted text,,
+Here is some data,Here is some data,,
+Here is some data,Here is some data,,
+Here is some data,Here is some

[Libreoffice-commits] .: 6 commits - sd/source

2012-04-14 Thread Jan Holesovsky 
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx|   11 
 sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx  |   49 +---
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx |1 
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx  |1 
 sd/source/ui/slidesorter/inc/view/SlsTheme.hxx  |   51 +---
 sd/source/ui/slidesorter/view/SlsButtonBar.cxx  |  141 
 sd/source/ui/slidesorter/view/SlsLayouter.cxx   |5 
 sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx |3 
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx  |1 
 sd/source/ui/slidesorter/view/SlsTheme.cxx  |   66 -
 sd/source/ui/slidesorter/view/SlsToolTip.cxx|2 
 11 files changed, 90 insertions(+), 241 deletions(-)

New commits:
commit 227113bbf16f2feda4d3e41bb9aff7dc100ede17
Author: Jan Holesovsky ke...@suse.cz
Date:   Sat Apr 14 21:46:14 2012 +0200

Slidesorter: Kill more useless cruft.

diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx 
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index afdf133..ec3ea1d 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -35,6 +35,7 @@
 #include model/SlsPageDescriptor.hxx
 #include model/SlsPageEnumerationProvider.hxx
 #include view/SlideSorterView.hxx
+#include view/SlsResource.hrc
 #include view/SlsTheme.hxx
 #include controller/SlideSorterController.hxx
 #include controller/SlsInsertionIndicatorHandler.hxx
@@ -120,17 +121,16 @@ class Clipboard::UndoContext
 public:
 UndoContext (
 SdDrawDocument* pDocument,
-const ::boost::shared_ptrViewShell rpMainViewShell,
-const ::boost::shared_ptrview::Theme rpTheme)
+const ::boost::shared_ptrViewShell rpMainViewShell)
 : mpDocument(pDocument),
   mpMainViewShell(rpMainViewShell)
 {
 if (mpDocument!=NULL  mpDocument-IsUndoEnabled())
 {
 if (mpMainViewShell  mpMainViewShell-GetShellType() == 
ViewShell::ST_DRAW)
-
mpDocument-BegUndo(rpTheme-GetString(view::Theme::String_DragAndDropPages));
+
mpDocument-BegUndo(String(SdResId(STRING_DRAG_AND_DROP_PAGES)));
 else
-
mpDocument-BegUndo(rpTheme-GetString(view::Theme::String_DragAndDropSlides));
+
mpDocument-BegUndo(String(SdResId(STRING_DRAG_AND_DROP_SLIDES)));
 }
 }
 
@@ -714,8 +714,7 @@ sal_Int8 Clipboard::ExecuteDrop (
 // Handle a general drop operation.
 mpUndoContext.reset(new UndoContext (
 mrSlideSorter.GetModel().GetDocument(),
-
mrSlideSorter.GetViewShell()-GetViewShellBase().GetMainViewShell(),
-mrSlideSorter.GetTheme()));
+
mrSlideSorter.GetViewShell()-GetViewShellBase().GetMainViewShell()));
 mpSelectionObserverContext.reset(new 
SelectionObserver::Context(mrSlideSorter));
 
 HandlePageDrop(*pDragTransferable);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 51c7157..ca45f8b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -96,7 +96,6 @@ private:
 Bitmap maMouseOverBackground;
 Bitmap maMouseOverFocusedBackground;
 Bitmap maMouseOverSelectedAndFocusedBackground;
-::rtl::OUString msUnhideString;
 ButtonBar mrButtonBar;
 Size maSize;
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 7e00ef3..2d60385 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -164,19 +164,6 @@ public:
 };
 const BitmapEx GetIcon (const IconType eType);
 
-enum StringType
-{
-String_Unhide,
-String_DragAndDropPages,
-String_DragAndDropSlides,
-String_Command1,
-String_Command2,
-String_Command2B,
-String_Command3,
-_StringType_Size_
-};
-::rtl::OUString GetString (const StringType eType) const;
-
 private:
 bool mbIsHighContrastMode;
 class GradientDescriptor
@@ -202,7 +189,6 @@ private:
 ::std::vectorGradientDescriptor maGradients;
 ::std::vectorBitmapEx maIcons;
 ::std::vectorColorData maColor;
-::std::vectorrtl::OUString maStrings;
 
 GradientDescriptor GetGradient (const GradientColorType eType);
 /** Guarded initialization of the specified icon in the maIcons
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index afe64c9..28c5a26 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -30,6 +30,7 @@

[Libreoffice-commits] .: 2 commits - writerfilter/debug_setup.mk writerfilter/source

2012-04-14 Thread Miklos Vajna 
 writerfilter/debug_setup.mk   |1 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   20 
 writerfilter/source/dmapper/SettingsTable.cxx |   22 +-
 writerfilter/source/dmapper/SettingsTable.hxx |3 +++
 4 files changed, 37 insertions(+), 9 deletions(-)

New commits:
commit 8adbd3df42ee18fe58455ac92a44bca4f76444c9
Author: Miklos Vajna vmik...@suse.cz
Date:   Sat Apr 14 23:31:19 2012 +0200

dmapper: parse NS_ooxml::LN_CT_Zoom_percent token

The VisibleBottom and ZoomType properties are just set as it seems
without that, SwView::ReadUserDataSequence() ignores the ZoomFactor as
well.

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index de03396..3c4e8eb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -74,6 +74,8 @@
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
 #include com/sun/star/util/XNumberFormats.hpp
 #include com/sun/star/embed/XEmbeddedObject.hpp
+#include com/sun/star/document/XViewDataSupplier.hpp
+#include com/sun/star/container/XIndexContainer.hpp
 #include rtl/ustrbuf.hxx
 #include rtl/string.h
 #include rtl/oustringostreaminserter.hxx
@@ -3543,6 +3545,24 @@ void DomainMapper_Impl::ApplySettingsTable()
 aSpacing.Height = sal_Int16(115);
 
xTextDefaults-setPropertyValue(rSupplier.GetName(PROP_PARA_LINE_SPACING), 
uno::makeAny(aSpacing));
 }
+
+if (m_pSettingsTable-GetZoomFactor())
+{
+uno::Sequencebeans::PropertyValue aViewProps(3);
+aViewProps[0].Name = ZoomFactor;
+aViewProps[0].Value = m_pSettingsTable-GetZoomFactor();
+aViewProps[1].Name = VisibleBottom;
+aViewProps[1].Value = sal_Int32(0);
+aViewProps[2].Name = ZoomType;
+aViewProps[2].Value = sal_Int16(0);
+
+uno::Referencecontainer::XIndexContainer 
xBox(m_xComponentContext-getServiceManager()-createInstanceWithContext(com.sun.star.document.IndexedPropertyValues,
+m_xComponentContext), uno::UNO_QUERY );
+xBox-insertByIndex(sal_Int32(0), uno::makeAny(aViewProps));
+uno::Referencecontainer::XIndexAccess xIndexAccess(xBox, 
uno::UNO_QUERY);
+uno::Referencedocument::XViewDataSupplier 
xViewDataSupplier(m_xTextDocument, uno::UNO_QUERY);
+xViewDataSupplier-setViewData(xIndexAccess);
+}
 }
 catch(const uno::Exception )
 {
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx 
b/writerfilter/source/dmapper/SettingsTable.cxx
index 870ce6f..1012d7b 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -75,6 +75,7 @@ struct SettingsTable_Impl
 ::rtl::OUString m_sHash;
 ::rtl::OUString m_sSalt;
 boolm_bLinkStyles;
+sal_Int16   m_nZoomFactor;
 
 SettingsTable_Impl( DomainMapper rDMapper, const uno::Reference 
lang::XMultiServiceFactory  xTextFactory ) :
 m_rDMapper( rDMapper )
@@ -92,6 +93,7 @@ struct SettingsTable_Impl
 , 
m_nCryptAlgorithmType(NS_ooxml::LN_Value_wordprocessingml_ST_AlgType_typeAny)
 , m_nCryptSpinCount(0)
 , m_bLinkStyles(false)
+, m_nZoomFactor(0)
 {}
 
 };
@@ -111,16 +113,13 @@ SettingsTable::~SettingsTable()
 
 void SettingsTable::lcl_attribute(Id nName, Value  val)
 {
-(void) nName;
 int nIntValue = val.getInt();
-(void)nIntValue;
-::rtl::OUString sValue = val.getString();
-(void)sValue;
 
 switch(nName)
 {
-//case NS_ooxml:::
-//break;
+case NS_ooxml::LN_CT_Zoom_percent:
+m_pImpl-m_nZoomFactor = nIntValue;
+break;
 default:
 {
 #ifdef DEBUG_DMAPPER_SETTINGS_TABLE
@@ -226,6 +225,11 @@ bool SettingsTable::GetLinkStyles() const
 return m_pImpl-m_bLinkStyles;
 }
 
+sal_Int16 SettingsTable::GetZoomFactor() const
+{
+return m_pImpl-m_nZoomFactor;
+}
+
 void SettingsTable::ApplyProperties( uno::Reference text::XTextDocument  
xDoc )
 {
 uno::Reference beans::XPropertySet xDocProps( xDoc, uno::UNO_QUERY );
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx 
b/writerfilter/source/dmapper/SettingsTable.hxx
index 79e095a..3d9a560 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -67,6 +67,9 @@ class WRITERFILTER_DLLPRIVATE SettingsTable : public 
LoggedProperties, public Lo
 /// Automatically update styles from document template?
 bool GetLinkStyles() const;
 
+/// What's the zoom factor set in percents?
+sal_Int16 GetZoomFactor() const;
+
 void ApplyProperties( uno::Reference text::XTextDocument  xDoc );
 
  private:
commit 9a8c2db542618b7a6d242b9d3257f23f54007682
Author:

[Libreoffice-commits] .: icon-themes/human icon-themes/oxygen

2012-04-14 Thread Miklos Vajna 
 icon-themes/human/cmd/lc_fliphorizontal.png  |binary
 icon-themes/human/cmd/lc_flipvertical.png|binary
 icon-themes/human/cmd/sc_fliphorizontal.png  |binary
 icon-themes/human/cmd/sc_flipvertical.png|binary
 icon-themes/oxygen/cmd/lc_fliphorizontal.png |binary
 icon-themes/oxygen/cmd/lc_flipvertical.png   |binary
 icon-themes/oxygen/cmd/sc_fliphorizontal.png |binary
 icon-themes/oxygen/cmd/sc_flipvertical.png   |binary
 8 files changed

New commits:
commit b32ae7fbaa0429bfc82fd8d82c1f437544880a08
Author: Stefan Knorr heinzless...@gmail.com
Date:   Sat Apr 14 22:20:07 2012 +0200

Correct icons for flipping images in Oxygen/Human themes

diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png 
b/icon-themes/human/cmd/lc_fliphorizontal.png
index 116cad6..b02e1fd 100644
Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and 
b/icon-themes/human/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/human/cmd/lc_flipvertical.png 
b/icon-themes/human/cmd/lc_flipvertical.png
index b02e1fd..116cad6 100644
Binary files a/icon-themes/human/cmd/lc_flipvertical.png and 
b/icon-themes/human/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png 
b/icon-themes/human/cmd/sc_fliphorizontal.png
index 901b218..9a2994b 100644
Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and 
b/icon-themes/human/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/human/cmd/sc_flipvertical.png 
b/icon-themes/human/cmd/sc_flipvertical.png
index 9a2994b..901b218 100644
Binary files a/icon-themes/human/cmd/sc_flipvertical.png and 
b/icon-themes/human/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/oxygen/cmd/lc_fliphorizontal.png 
b/icon-themes/oxygen/cmd/lc_fliphorizontal.png
index 8e39935..6828b4d 100644
Binary files a/icon-themes/oxygen/cmd/lc_fliphorizontal.png and 
b/icon-themes/oxygen/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/oxygen/cmd/lc_flipvertical.png 
b/icon-themes/oxygen/cmd/lc_flipvertical.png
index 6828b4d..8e39935 100644
Binary files a/icon-themes/oxygen/cmd/lc_flipvertical.png and 
b/icon-themes/oxygen/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/oxygen/cmd/sc_fliphorizontal.png 
b/icon-themes/oxygen/cmd/sc_fliphorizontal.png
index 6b428d0..c9a7442 100644
Binary files a/icon-themes/oxygen/cmd/sc_fliphorizontal.png and 
b/icon-themes/oxygen/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/oxygen/cmd/sc_flipvertical.png 
b/icon-themes/oxygen/cmd/sc_flipvertical.png
index c9a7442..6b428d0 100644
Binary files a/icon-themes/oxygen/cmd/sc_flipvertical.png and 
b/icon-themes/oxygen/cmd/sc_flipvertical.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - sal/inc sc/qa sc/source

2012-04-14 Thread Markus Mohrhard 
 sal/inc/rtl/math.hxx   |   13 +
 sc/qa/unit/ucalc.cxx   |   19 ++-
 sc/source/core/data/table4.cxx |   22 +++---
 3 files changed, 50 insertions(+), 4 deletions(-)

New commits:
commit 89986db6d5033181324e595032b8d3879d41a705
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Apr 15 01:24:17 2012 +0200

add test case for autofill with user defined lists

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 78fe168..c743e68 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -211,6 +211,7 @@ public:
 void testAutoFill();
 
 CPPUNIT_TEST_SUITE(Test);
+#if 0
 CPPUNIT_TEST(testCollator);
 CPPUNIT_TEST(testInput);
 CPPUNIT_TEST(testCellFunctions);
@@ -248,6 +249,7 @@ public:
 CPPUNIT_TEST(testJumpToPrecedentsDependents);
 CPPUNIT_TEST(testSetBackgroundColor);
 CPPUNIT_TEST(testRenameTable);
+#endif
 CPPUNIT_TEST(testAutoFill);
 CPPUNIT_TEST_SUITE_END();
 
@@ -4202,7 +4204,22 @@ void Test::testAutoFill()
 }
 }
 
-
+// test auto fill user data lists
+m_pDoc-SetString( 0, 100, 0, January );
+m_pDoc-Fill( 0, 100, 0, 100, NULL, aMarkData, 2, FILL_TO_BOTTOM, 
FILL_AUTO );
+rtl::OUString aTestValue = m_pDoc-GetString( 0, 101, 0 );
+CPPUNIT_ASSERT_EQUAL( aTestValue, rtl::OUString(February) );
+aTestValue = m_pDoc-GetString( 0, 102, 0 );
+CPPUNIT_ASSERT_EQUAL( aTestValue, rtl::OUString(March) );
+
+// test that two same user data list entries will not result in 
incremental fill
+m_pDoc-SetString( 0, 101, 0, January );
+m_pDoc-Fill( 0, 100, 0, 101, NULL, aMarkData, 2, FILL_TO_BOTTOM, 
FILL_AUTO );
+for ( SCROW i = 102; i = 103; ++i )
+{
+aTestValue = m_pDoc-GetString( 0, i, 0 );
+CPPUNIT_ASSERT_EQUAL( aTestValue, rtl::OUString(January) );
+}
 m_pDoc-DeleteTab(0);
 }
 
commit 5af699cf62b2313980add377a777c49dc1e7ae2a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Apr 15 00:11:08 2012 +0200

don't deduce increment from multiple equal list entries, fdo#39500

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index d15a74e..cced07c 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -342,6 +342,22 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 {
 rtl::OUString aStr;
 GetString(nCol, nRow, aStr);
+
+// fdo#39500 don't deduce increment from multiple equal list entries
+bool bAllSame = true;
+for (sal_uInt16 i = 0; i  nCount; ++i)
+{
+rtl::OUString aTestStr;
+GetString(static_castSCCOL(nCol + i* nAddX), 
static_castSCROW(nRow + i * nAddY), aTestStr);
+if(aStr != aTestStr)
+{
+bAllSame = false;
+break;
+}
+}
+if(bAllSame  nCount  1)
+return;
+
 rListData = (ScUserListData*)(ScGlobal::GetUserList()-GetData(aStr));
 if (rListData)
 {
commit cc94996d96ea8d8e3d136af66846707f9b838bbf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Apr 14 21:00:19 2012 +0200

autofill increment needs a bit more tolerance, fdo#37424

diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 2018308..8f4991a 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -263,6 +263,19 @@ inline bool approxEqual(double a, double b)
  ((a  0.0 ? -a : a) * (1.0 / (16777216.0 * 16777216.0)));
 }
 
+/** Test equality of two values with an accuracy defined by nPrec
+
+@attention
+approxEqual( value!=0.0, 0.0 ) _never_ yields true.
+ */
+inline bool approxEqual(double a, double b, sal_Int16 nPrec)
+{
+if ( a == b )
+return true;
+double x = a - b;
+return (x  0.0 ? -x : x)
+ ((a  0.0 ? -a : a) * (1.0 / (pow(2, nPrec;
+}
 /** Add two values.
 
 If signs differ and the absolute values are equal according to 
approxEqual()
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index a632cf8..d15a74e 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -324,7 +324,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 {
 nVal2 = ((ScValueCell*)pCell)-GetValue();
 double nDiff = nVal2 - nVal1;
-if ( !::rtl::math::approxEqual( nDiff, rInc ) )
+if ( !::rtl::math::approxEqual( nDiff, rInc, 13 ) )
 bVal = false;
 nVal1 = nVal2;
 }
@@ -395,7 +395,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 if ( nFlag1 == nFlag2 )
 {
 double nDiff = (double)nVal2 - (double)nVal1;

[Libreoffice-commits] .: sal/inc

2012-04-14 Thread Markus Mohrhard 
 sal/inc/rtl/math.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d804a0052fe661603bc8280bfa541a7b0a302ae
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Apr 15 02:18:37 2012 +0200

fix ambiguous call on windows

diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 8f4991a..40eba50 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -274,7 +274,7 @@ inline bool approxEqual(double a, double b, sal_Int16 nPrec)
 return true;
 double x = a - b;
 return (x  0.0 ? -x : x)
- ((a  0.0 ? -a : a) * (1.0 / (pow(2, nPrec;
+ ((a  0.0 ? -a : a) * (1.0 / (pow(static_castdouble(2.0), 
nPrec;
 }
 /** Add two values.
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svl/source

2012-04-14 Thread Eike Rathke 
 svl/source/numbers/zforfind.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a6ad8e8f0a52881311b16af611e1ad701946c608
Author: Eike Rathke er...@redhat.com
Date:   Sun Apr 15 02:38:46 2012 +0200

resolved fdo#48706 recognize $.12 as currency number

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 9a0c59a..3c5d835 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1811,6 +1811,11 @@ bool ImpSvNumberInputScan::ScanStartString( const 
String rString,
 if ( nSign )   // DM -1
 SkipBlanks(rString, nPos);
 }
+if ( GetDecSep(rString, nPos) ) // decimal separator 
follows currency
+{
+nDecPos = 1;
+SkipBlanks(rString, nPos);
+}
 }
 else
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits