[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/rtftok.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49a4b4c32bda86b97ef48d1d2ce9bf8f02d3e2e3 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Feb 14 10:55:50 2012 +0200 Fix int/sal_Int32 ambiguity diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx index df2966f..9afb4f2 100644 --- a/sw/qa/extras/rtftok/rtftok.cxx +++ b/sw/qa/extras/rtftok/rtftok.cxx @@ -156,7 +156,7 @@ void RtfModelTest::testFdo45543() aBuf.append(xRange-getString()); } } -CPPUNIT_ASSERT_EQUAL(5, aBuf.getLength()); +CPPUNIT_ASSERT_EQUAL((sal_Int32)5, aBuf.getLength()); } CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: odk/settings
odk/settings/std.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 14 10:32:59 2012 +0100 Resolves rhbz#789622: Adapt SDK to changed paths in LO installation diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 0726631..705b528 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES=$(subst \,/,$(URE_MISC)$(PS)types.rdb) URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) -OFFICE_TYPES=$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb) -OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) +OFFICE_TYPES=$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb) +OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb) OFFICE_TYPE_LIBRARY=$(OFFICE_TYPES) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/mkdocs.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f9d2a8643548d6bc138f8b36a8fff95d658d5bc1 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Feb 14 08:50:26 2012 +0100 Remove accidental comment diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index a0ad6e4..a075a74 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -177,7 +177,7 @@ do echo Ref-Tags: $DOXYGEN_REF_TAGFILES echo Title: $DOXYGEN_PROJECTNAME - #nice -15 doxygen $DOXYGEN_CFG || exit 1 + nice -15 doxygen $DOXYGEN_CFG || exit 1 # setup referenced tagfiles for next round DOXYGEN_REF_TAGFILES=$DOXYGEN_REF_TAGFILES $DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppunit/makefile.mk
cppunit/makefile.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 9529389231cfe44bff015a8fc511fff75910664d Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 14 11:39:36 2012 +0100 Mark cppunit patch as upstreamed diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 30734ce..d96d7f4 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -56,7 +56,9 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix # http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= # 7a09bf3a88e99d85c4dec2ad296309dbec2987c3 # cppunit-1.12.1-warnings.patch: work around additional warnings (found when -# converting module unotest to gbuild) +# converting module unotest to gbuild); upstreamed as +# http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= +# 0f75eaa0b8de3d68e8b5b5447fbc009531183cb5 .IF $(OS) == ANDROID PATCH_FILES += android.patch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - external/gcc3_specific
external/gcc3_specific/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1c8b3caa24182c1468ecb69cb795a537eee802a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 13 15:39:43 2012 +0100 Copy the gcc's stdlibs to solver even if not packaging them Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 501acfa..b6211c4 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -6,7 +6,7 @@ TARGET=gcc3_specific .INCLUDE: settings.mk # -- -.IF $(SYSTEM_STDLIBS) != YES $(COMID)==gcc3 +.IF $(COMID)==gcc3 .IF $(OS)!=MACOSX $(OS)!=IOS $(OS)!=ANDROID $(OS)!=FREEBSD $(OS)!=NETBSD $(OS)!=OPENBSD $(OS)!=DRAGONFLY ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - 2 commits - android/qa Library_merged.mk sc/CppunitTest_sc_filters_test.mk sc/qa solenv/gbuild
Library_merged.mk |5 +++--
android/qa/desktop/Makefile|2 --
android/qa/sc/Makefile |2 --
sc/CppunitTest_sc_filters_test.mk |3 +++
sc/qa/unit/helper/qahelper.hxx | 15 +++
solenv/gbuild/extensions/pre_MergedLibsList.mk |2 ++
6 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit d6a8dc59fccd57a3f869791586e23008ac805428
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 12:56:43 2012 +0200
Special-case files in /assets on Android
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index 259d308..0ec2b93 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -63,6 +63,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test,
\
utl \
vcl \
xo \
+ $(if $(filter $(OS),ANDROID), \
+ lo-bootstrap \
+ ) \
$(gb_STDLIBS) \
))
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 4c9ae91..c679c73 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -36,9 +36,24 @@
#include string
#include sstream
+#include osl/detail/android-bootstrap.h
+
void loadFile(const rtl::OUString aFileName, std::string aContent)
{
rtl::OString aOFileName = rtl::OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8);
+
+#ifdef ANDROID
+const char *contents;
+size_t size;
+if (strncmp(aOFileName.getStr(), /assets/, sizeof(/assets/)-1) == 0) {
+contents = (const char *) lo_apkentry(aOFileName.getStr(), size);
+if (contents != 0) {
+aContent = std::string(contents, size);
+return;
+}
+}
+#endif
+
std::ifstream aFile(aOFileName.getStr());
rtl::OStringBuffer aErrorMsg(Could not open csv file: );
commit 35bc227b9eeef69a95b8b6996e3696e643f34b8c
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 12:39:43 2012 +0200
Add svt and tk to libmerged
diff --git a/Library_merged.mk b/Library_merged.mk
index d1af075..a01cca8 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,13 +30,13 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
cppuhelper \
i18nisolang1 \
i18npaper \
+i18nutil \
+jvmfwk \
sal \
salhelper \
sax \
sot \
svl \
- svt \
- tk \
tl \
ucbhelper \
utl \
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
$(eval $(call gb_Library_use_externals,merged,\
icuuc \
+ jpeg \
libxml2 \
zlib \
))
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index b02ebd0..67fdb7c 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -150,9 +150,7 @@ copy-stuff: buildrcs
stocservices.uno \
store \
svllo \
- svtlo \
test \
- tklo \
tllo \
ucb1 \
ucbhelper4gcc3 \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 054ba79..71d145b 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -95,10 +95,8 @@ copy-stuff:
stocservices.uno \
store \
svllo \
- svtlo \
textinstream.uno \
test \
- tklo \
tllo \
ucb1 \
ucbhelper4gcc3 \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cff4b19..a7dfc22 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -47,8 +47,10 @@ gb_MERGEDLIBS := \
sfx \
sofficeapp \
spl \
+ svt \
svx \
svxcore \
+ tk \
uui \
xo \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - sc/qa
sc/qa/unit/helper/qahelper.hxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 09d4dabaea123b8545200244b6c5829115f52bec
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 13:06:10 2012 +0200
Add comment wondering why this loadFile() isn't in osl
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index c679c73..0974e70 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -38,6 +38,12 @@
#include osl/detail/android-bootstrap.h
+// Why is this here and not in osl, and using the already existing file
+// handling APIs? Do we really want to add arbitrary new file handling
+// wrappers here and there (and then having to handle the Android (and
+// eventually perhaps iOS) special cases here, too)? Please move this to osl,
+// it sure looks gemerally useful. Or am I missing something?
+
void loadFile(const rtl::OUString aFileName, std::string aContent)
{
rtl::OString aOFileName = rtl::OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/abpilot/typeselectionpage.cxx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 64c37949a4f07ceb03b9da85a5fae73251abbaf2
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Feb 13 17:36:23 2012 +0100
fdo#43399 hidden radio button should also gets unset
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/abpilot/typeselectionpage.cxx
b/extensions/source/abpilot/typeselectionpage.cxx
index 711159e..aee5219 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -110,9 +110,13 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_aOE, AST_OE, bWithMozilla
!bUnx ) );
m_aAllTypes.push_back( ButtonItem( m_aOther, AST_OTHER, true ) );
-bool bFirstVisible = true;
Link aTypeSelectionHandler = LINK(this, TypeSelectionPage,
OnTypeSelected );
const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) );
+if ( ! m_aAllTypes.empty() )
+{
+ButtonItem aItem = m_aAllTypes[0];
+aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() | WB_GROUP );
+}
for ( ::std::vector ButtonItem ::const_iterator loop =
m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
@@ -125,12 +129,6 @@ namespace abp
aTopLeft.Y() += aItemSize.Height() + aSpacing.Height();
aItem.m_pItem-SetClickHdl( aTypeSelectionHandler );
aItem.m_pItem-Show();
-
-if ( bFirstVisible )
-{
-aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() |
WB_GROUP );
-bFirstVisible = false;
-}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - extensions/source
extensions/source/abpilot/typeselectionpage.cxx | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit e5bbb64626106bdfceea47b7b7c580172d5ae420
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Feb 13 17:36:23 2012 +0100
fdo#43399 hidden radio button should also gets unset
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/extensions/source/abpilot/typeselectionpage.cxx
b/extensions/source/abpilot/typeselectionpage.cxx
index f78878f..020e3a0 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -112,9 +112,13 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_aOE, AST_OE, bWithMozilla
!bUnx ) );
m_aAllTypes.push_back( ButtonItem( m_aOther, AST_OTHER, true ) );
-bool bFirstVisible = true;
Link aTypeSelectionHandler = LINK(this, TypeSelectionPage,
OnTypeSelected );
const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) );
+if ( ! m_aAllTypes.empty() )
+{
+ButtonItem aItem = m_aAllTypes[0];
+aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() | WB_GROUP );
+}
for ( ::std::vector ButtonItem ::const_iterator loop =
m_aAllTypes.begin();
loop != m_aAllTypes.end(); ++loop )
{
@@ -127,12 +131,6 @@ namespace abp
aTopLeft.Y() += aItemSize.Height() + aSpacing.Height();
aItem.m_pItem-SetClickHdl( aTypeSelectionHandler );
aItem.m_pItem-Show();
-
-if ( bFirstVisible )
-{
-aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() |
WB_GROUP );
-bFirstVisible = false;
-}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 9fbd7ac6eb460e47f6caf4f561295296c045cb10
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Feb 14 12:33:11 2012 +0100
3.5.0 RC3 is Final.
diff --git a/check.php b/check.php
index 2edad15..f57b8fa 100644
--- a/check.php
+++ b/check.php
@@ -100,7 +100,8 @@ $update_versions = array(
'e40af8c-10029e3-615e522-88673a2-727f724' = 'LO-3.5', # 3.5.0 Beta3
'b6c8ba5-8c0b455-0b5e650-d7f0dd3-b100c87' = 'LO-3.5', # 3.5.0 RC1
'e371a95-bf68a13-5a1aa2b-d3c1ae9-b938258' = 'LO-3.5', # 3.5.0 RC2
-#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3
+# To be uncommented when 3.5.1 Final is out
+#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3 /
Final
);
# Descriptions of the target versions
@@ -109,10 +110,16 @@ $update_versions = array(
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
'LO-3.5' = array('gitid' =
'7e68ba2-a744ebf-1f241b7-c506db1-7d53735',
- 'id' = 'LibreOffice 3.5.0 RC3',
- 'version' = '3.5.0 RC3',
+ 'id' = 'LibreOffice 3.5.0',
+ 'version' = '3.5.0',
'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/pre-releases/')
+ 'update_src' = 'http://www.libreoffice.org/download/'),
+# To be uncommented when 3.5.1 RC2 is out, to get updates from 3.5.1 RC1
+#'LO-3.5-pre' = array('gitid' = '',
+# 'id' = 'LibreOffice 3.5.1 RC2',
+# 'version' = '3.5.1 RC2',
+# 'update_type' = 'text/html',
+# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
# Print the update xml
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/rtl/instance.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3073b539d28a4ea29347e8060e19dda080c5d13b
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 14 12:32:54 2012 +0100
Make code exploiting -fthreadsafe-statics properly conditional
Looks like 979e2c8f8b9325a5c75bfc1f388aa8f69b988d2c missed these.
diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 943a449..9520dac 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -446,7 +446,7 @@ private:
using the outer class
(the one that derives from this base class)
*/
-#if (__GNUC__ = 4)
+#if defined HAVE_THREADSAFE_STATICS
templatetypename T, typename Data, typename Unique
class StaticWithArg {
public:
@@ -528,7 +528,7 @@ private:
@tparam InitAggregate
initializer functor class
*/
-#if (__GNUC__ = 4)
+#if defined HAVE_THREADSAFE_STATICS
templatetypename T, typename InitAggregate
class StaticAggregate {
public:
@@ -593,7 +593,7 @@ public:
Initializer functor's return type.
Default is T (common practice).
*/
-#if (__GNUC__ = 4)
+#if defined HAVE_THREADSAFE_STATICS
templatetypename T, typename InitData,
typename Unique = InitData, typename Data = T
class StaticWithInit {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/text/itrform2.cxx |5 ++---
sw/source/core/text/txttab.cxx |4
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit efae3866d2f3ff23f403d81f58e719a69bf070e9
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Feb 10 21:57:54 2012 +0100
fdo#45908: Cleaning up the tabs too early can cause loops
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 54a7825..9bf93d2 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1375,9 +1375,8 @@ SwLinePortion *SwTxtFormatter::NewPortion(
SwTxtFormatInfo rInf )
}
}
-// Wenn eine Portion erzeugt wird, obwohl eine RestPortion ansteht,
-// dann haben wir es mit einem Feld zu tun, das sich aufgesplittet
-// hat, weil z.B. ein Tab enthalten ist.
+// if a portion is created despite there being a pending RestPortion,
+// then it is a field which has been split (e.g. because it contains a
Tab)
if( pPor rInf.GetRest() )
pPor-SetLen( 0 );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index fceddca..8841e39 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -82,10 +82,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const
SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo rInf, bool bAuto
) const
{
SwTabPortion *pTabPor = 0;
-SwTabPortion *pLastTab = rInf.GetLastTab();
-if( pLastTab ( pLastTab-IsTabCntPortion() ||
pLastTab-IsTabDecimalPortion() ) )
-if( pLastTab-PostFormat( rInf ) )
-return 0;
xub_Unicode cFill = 0;
xub_Unicode cDec = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source
sw/source/core/text/itrform2.cxx |5 ++---
sw/source/core/text/txttab.cxx |4
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 042e3727babc62913c753594412e7d7efbed43bf
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Feb 10 21:57:54 2012 +0100
fdo#45908: Cleaning up the tabs too early can cause loops
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 78dd1f1..c7a6cbe 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1383,9 +1383,8 @@ SwLinePortion *SwTxtFormatter::NewPortion(
SwTxtFormatInfo rInf )
}
}
-// Wenn eine Portion erzeugt wird, obwohl eine RestPortion ansteht,
-// dann haben wir es mit einem Feld zu tun, das sich aufgesplittet
-// hat, weil z.B. ein Tab enthalten ist.
+// if a portion is created despite there being a pending RestPortion,
+// then it is a field which has been split (e.g. because it contains a
Tab)
if( pPor rInf.GetRest() )
pPor-SetLen( 0 );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 5b77142..d3f4e8c 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -85,10 +85,6 @@ sal_uInt16 SwLineInfo::NumberOfTabStops() const
SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo rInf, bool bAuto
) const
{
SwTabPortion *pTabPor = 0;
-SwTabPortion *pLastTab = rInf.GetLastTab();
-if( pLastTab ( pLastTab-IsTabCntPortion() ||
pLastTab-IsTabDecimalPortion() ) )
-if( pLastTab-PostFormat( rInf ) )
-return 0;
xub_Unicode cFill = 0;
xub_Unicode cDec = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/text/txtfly.cxx | 64 -
sw/source/core/text/txtfrm.cxx | 39
2 files changed, 103 deletions(-)
New commits:
commit 3bbb62f09fef9d8526ef6d4bdacc55def952963a
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 13:38:59 2012 +0100
sw: dead code removal
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 7a7ddf5..c2695f9 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -121,8 +121,6 @@ void SwTxtFormatter::CalcUnclipped( SwTwips rTop, SwTwips
rBottom )
SwTxtFormatter::CalcUnclipped with unswapped frame );
long nFlyAsc, nFlyDesc;
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pCurr, rTop, rBottom, nFlyAsc, nFlyDesc );
pCurr-MaxAscentDescent( rTop, rBottom, nFlyAsc, nFlyDesc );
rTop = Y() + GetCurr()-GetAscent();
rBottom = rTop + nFlyDesc;
@@ -156,8 +154,6 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent,
Point aStart,
aTmpInf.SetPos( aStart );
long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc;
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pPos, nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc );
pCurrent-MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc );
KSHORT nTmpHeight = pCurrent-GetRealHeight();
@@ -195,9 +191,6 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent,
Point aStart,
if( ( pPos-IsFlyCntPortion() || pPos-IsGrfNumPortion() )
( bAllWays || !IsQuick() ) )
{
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pFirst, nTmpAscent, nTmpDescent,
-// nFlyAsc, nFlyDesc, pPos );
pCurrent-MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc,
nFlyDesc, pPos );
if( pPos-IsGrfNumPortion() )
@@ -290,9 +283,6 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine )
const
{
if( pPos-IsFlyCntPortion() || pPos-IsGrfNumPortion() )
{
-// OD 08.01.2004 #i11859# - use new method
SwLineLayout::MaxAscentDescent(..)
-//lcl_MaxAscDescent( pFirst, nTmpAscent, nTmpDescent,
-// nFlyAsc, nFlyDesc, pPos );
pCurr-MaxAscentDescent( nTmpAscent, nTmpDescent, nFlyAsc,
nFlyDesc, pPos );
if( pPos-IsGrfNumPortion() )
@@ -963,8 +953,6 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo rInf )
const SwFmtSurround rSur = pFmt-GetSurround();
const SwFmtAnchor rAnchor = pFmt-GetAnchor();
//Nur undurchsichtige und weiter oben liegende.
-/// OD 08.10.2002 #103898# - add condition
-/// !(pFly-IsBackgroundTransparent() ||
pFly-IsShadowTransparent())
if( !( pFly-IsBackgroundTransparent()
|| pFly-IsShadowTransparent() )
SURROUND_THROUGHT == rSur.GetSurround()
@@ -1203,13 +1191,6 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject*
_pAnchoredObj,
// anchored objects to one in the page header/footer and
// the document body -- content of
at-paragraph/at-character
// anchored objects doesn't wrap around each other.
-//else if( bInFooterOrHeader )
-//return sal_False; // In header or footer no wrapping
-// // if both bounded at paragraph
-//else // Zwei Flies mit (auto-)absatzgebunder Verankerung
...
-//// ... entscheiden nach der Reihenfolge ihrer Anker im
Dok.
-// bEvade = rNewA.GetCntntAnchor()-nNode.GetIndex() =
-// rCurrA.GetCntntAnchor()-nNode.GetIndex();
else
return sal_False;
}
@@ -1451,51 +1432,6 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
// If objects on the same position are found, they are sorted
// on its width.
// #i68520#
-//sal_uInt16 nPos = pFlyList-Count();
-//while ( nPos )
-//{
-//SdrObject* pTmpObj = (*pFlyList)[ --nPos ];
-//const SwRect aBoundRectOfTmpObj( GetBoundRect( pTmpObj )
);
-//if ( ( bR2L
-// ( (aBoundRectOfTmpObj.*fnRect-fnGetRight)() ==
-// (aBound.*fnRect-fnGetRight)() ) ) ||
-// ( !bR2L
-// ( (aBoundRectOfTmpObj.*fnRect-fnGetLeft)() ==
-// (aBound.*fnRect-fnGetLeft)() ) ) )
-//{
[Libreoffice-commits] .: configmgr/README configmgr/source
configmgr/README| 132 configmgr/source/README | 155 2 files changed, 131 insertions(+), 156 deletions(-) New commits: commit 00717e8550ac41069a01c7ef7c11fbe40d75e91d Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 14 13:48:09 2012 +0100 Moved configmgr/source/README into configmgr/README diff --git a/configmgr/README b/configmgr/README index e63f37c..2c3cfa6 100644 --- a/configmgr/README +++ b/configmgr/README @@ -1 +1,131 @@ -The configuration database - UNO services and some tools. +UNO services to access the configuration database + + +== Source Overview == + +configurationprovider.cxx +configurationregistry.cxx +defaultprovider.cxx +services.cxx + UNO service implementations. + +access.cxx +childaccess.cxx +rootaccess.cxx + UNO objects passed to clients. + +components.cxx + Central singleton that aggregates all data (reads in the XML files, manages + modifications and global notifications). + +groupnode.cxx +localizedpropertynode.cxx +localizedvaluenode.cxx +node.cxx +propertynode.cxx +setnode.cxx + Internal representations of data nodes. + +parsemanager.cxx +parser.hxx +valueparser.cxx +xcdparser.cxx +xcsparser.cxx +xcuparser.cxx +xmldata.cxx + XML file reading. + +modifications.cxx +writemodfile.cxx + Modification management. + +broadcaster.cxx + Notification management. + +additions.hxx +update.cxx + Extension manager interface. + +data.cxx +lock.cxx +nodemap.cxx +partial.cxx +path.hxx +type.cxx + Utilities. + + +== Some Implementation Notes == + +=== Mandatory Set Members === + +- A set member can be marked as mandatory, meaning that a member of that name +must always be present in a set. + +- The above definition implies that calling replaceByName on a mandatory set +member is OK. + +- The XCU format can contain oor:mandatory attributes on nodes. (The XCS format +does not support them. In the registrymodifications file, oor:mandatory +attributes should never be needed, as being mandatory cannot be controlled via +the UNO API.) The XCU reading code only evaluates the oor:mandatory attribute +for set members, and ignores it everywhere else. + +- Only true sets support mandatory members. A localized property for the * +locale, though acting much like a set, does not support mandatory members. + +- The OpenOffice.org Registry Format document claims that group extension +properties are implicitly mandatory, but at least the new configmgr code does +not treat them like that (i.e., they can be removed again). + +- For simplicity, setMandatory/getMandatory are available as virtual functions +at the base Node, even though they can only make sense for GroupNodes and +SetNodes that are set members. The default getMandatory implementation returns +NO_LAYER, meaning oor:mandatory is not set to true in any layer. (Returning +NO_LAYER simplifies the code, e.g., removeByName does not have to check whether +getMandatory is called on a member of a true set to decide whether to forbid +removal.) + +- When committing changes (made through the UNO API), the mandatory status of +inserted nodes must be updated (in case the insert is due to a replaceByName, or +the mandatory flag was added by a concurrent modification of a lower layer). +Also, for to-be-removed nodes, removal is ignored for (newly; due to concurrent +modification of a lower layer) mandatory nodes (but still recorded in +registrymodifications, so may take effect once the lower layer addition is +removed again---whether or not that is a good idea). + + +=== XcuParser Modification Recording === + +- XcuParser records modifications when reading user layer data +(valueParser_.getLayer() == Data::NO_LAYER). + +- oor:finalized and oor:mandatory attributes cannot be set via the UNO API, so +it is assumed that user layer data does not contain them (for one, they are not +written by writeModFile; for another, the logic to record modifications expects +a locprop(modify,fuse) to be followed by one or more value(fuse,remove), which +would not necessarily be true if the locprop were only present in the user layer +data to flag it as finalized). + +- The logic to record modifications considers the top of the XML element stack. +In the following list of all possible cases, items marked with an asterisk are +recorded: + ... group(modify,fuse) - group(modify,fuse) - ... + ... group(modify,fuse) - set(modify,fuse) - ... + ... group(modify,fuse) - *prop(modify,fuse,replace) - value(fuse) + ... group(modify,fuse) - *prop(remove) + ... group(modify,fuse) - locprop(modify,fuse) - *value(fuse) + ... group(modify,fuse) - locprop(modify,fuse) - *value(remove) + ... group(modify,fuse) - *locprop(replace) ... + ... set(modify,fuse,replace) - group(modify/fuse) - ... + ... set(modify,fuse,replace) - *group(replace/fuse) - ... + ... set(modify,fuse,replace) - *group(remove) + ... set(modify,fuse,replace) - set(modify/fuse) - ... + ...
[Libreoffice-commits] .: connectivity/source cui/source desktop/source
connectivity/source/commontools/dbtools2.cxx |1
cui/source/inc/treeopt.hxx |9
cui/source/options/optpath.cxx | 15 -
cui/source/options/treeopt.cxx | 318 ---
desktop/source/app/app.cxx | 43 ---
5 files changed, 164 insertions(+), 222 deletions(-)
New commits:
commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 14 14:19:07 2012 +0100
Some more comphelper/configurationhelper clean up
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index 7ea7bc9..e559847 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -53,7 +53,6 @@
#include tools/diagnose_ex.h
#include unotools/sharedunocomponent.hxx
-#include comphelper/configurationhelper.hxx
//.
namespace dbtools
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index a107750..90777c8 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -138,7 +138,6 @@ struct LastPageSaver
// class OfaTreeOptionsDialog
namespace com { namespace sun { namespace star { namespace frame { class
XFrame; } } } }
-namespace com { namespace sun { namespace star { namespace container { class
XNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
namespace com { namespace sun { namespace star { namespace awt { class
XContainerWindowProvider; } } } }
@@ -192,12 +191,8 @@ private:
com::sun::star::lang::XMultiServiceFactory xMFac,
const com::sun::star::uno::Reference
com::sun::star::frame::XFrame
xFrame );
-Module* LoadModule( const rtl::OUString rModuleIdentifier,
-const com::sun::star::uno::Reference
-com::sun::star::container::XNameAccess
xRoot );
-voidLoadNodes( const com::sun::star::uno::Reference
-com::sun::star::container::XNameAccess
xRoot,
- Module* pModule,
+Module* LoadModule( const rtl::OUString rModuleIdentifier );
+voidLoadNodes( Module* pModule,
const rtl::OUString rExtensionId,
VectorOfNodes rOutNodeList );
voidInsertNodes( const VectorOfNodes rNodeList );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index cdecf06..4d8f8a9 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -50,7 +50,7 @@
#include optpath.hrc
#include cuires.hrc
#include helpid.hrc
-#include comphelper/configurationhelper.hxx
+#include comphelper/configuration.hxx
#include comphelper/processfactory.hxx
#include comphelper/string.hxx
#include com/sun/star/uno/Exception.hpp
@@ -59,6 +59,7 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
#include com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp
+#include officecfg/Office/Common.hxx
#include optHeaderTabListbox.hxx
#include readonlyimage.hxx
#include vcl/help.hxx
@@ -532,13 +533,11 @@ void SvxPathTabPage::ChangeCurrentEntry( const String
_rFolder )
// Set configuration flag to notify file picker that it's necessary
// to take over the path provided.
-Reference XMultiServiceFactory xFactory(
::comphelper::getProcessServiceFactory() );
-::comphelper::ConfigurationHelper::writeDirectKey(xFactory,
-::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.Common/)),
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(Path/Info)),
-::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(WorkPathChanged)),
-::com::sun::star::uno::makeAny(true),
-::comphelper::ConfigurationHelper::E_STANDARD);
+boost::shared_ptr comphelper::ConfigurationChanges batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Common::Path::Info::WorkPathChanged::set(
+true, batch);
+batch-commit();
}
}
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 51a8066..96a5999 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,11 +67,11 @@
#include com/sun/star/frame/XModuleManager.hpp
#include com/sun/star/loader/CannotActivateFactoryException.hpp
#include com/sun/star/util/XMacroExpander.hpp
-#include
[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/PageBreakWin.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 9baee86cbdec44c657d06f355bdba0537fb12a1a
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Tue Feb 14 14:19:52 2012 +0100
fdo#45748: Don't use empty pages fo computing the page break position
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0439bc3..f92101c 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -333,9 +333,13 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
}
const SwPageFrm* pPageFrm = GetPageFrame();
-const SwFrm* pPrevPage = pPageFrm-GetPrev();
-while ( pPrevPage ( pPrevPage-Frm().Top( ) == pPageFrm-Frm().Top( ) )
)
+const SwFrm* pPrevPage = pPageFrm;
+do
+{
pPrevPage = pPrevPage-GetPrev();
+}
+while ( pPrevPage ( ( pPrevPage-Frm().Top( ) == pPageFrm-Frm().Top( )
)
+|| static_cast const SwPageFrm* ( pPrevPage )-IsEmptyPage(
) ) );
Rectangle aBoundRect = GetEditWin()-LogicToPixel(
pPageFrm-GetBoundRect().SVRect() );
Rectangle aFrmRect = GetEditWin()-LogicToPixel( pPageFrm-Frm().SVRect()
);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit cc459ea8c1d2d398c0bad5e52591af93ebc4db38 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Feb 14 12:40:24 2012 +0200 Skip merged libraries diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index d542017..0fff77f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -467,8 +467,9 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.dll,%.ilk,$(3)) \ ) +$(if $(filter $(gb_MERGEDLIBS),$(1)),,\ $(call gb_Library_get_target,$(1)) \ -$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) +$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))) ifneq ($(ENABLE_CRASHDUMP),) $(call gb_Library_get_target,$(1)) \ @@ -480,7 +481,7 @@ endif $(call gb_Library_add_default_nativeres,$(1),$(1)/default) -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) +$(if $(filter $(gb_MERGEDLIBS),$(1)),,$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))) $(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/docvw/PageBreakWin.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 66cf06ebdd4eeb95e801de114af06b49119fc7fe
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Tue Feb 14 14:19:52 2012 +0100
fdo#45748: Don't use empty pages fo computing the page break position
(cherry picked from commit 9baee86cbdec44c657d06f355bdba0537fb12a1a)
Signed-off-by: Tor Lillqvist tlillqv...@suse.com
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0439bc3..f92101c 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -333,9 +333,13 @@ void SwPageBreakWin::UpdatePosition( const Point* pEvtPt )
}
const SwPageFrm* pPageFrm = GetPageFrame();
-const SwFrm* pPrevPage = pPageFrm-GetPrev();
-while ( pPrevPage ( pPrevPage-Frm().Top( ) == pPageFrm-Frm().Top( ) )
)
+const SwFrm* pPrevPage = pPageFrm;
+do
+{
pPrevPage = pPrevPage-GetPrev();
+}
+while ( pPrevPage ( ( pPrevPage-Frm().Top( ) == pPageFrm-Frm().Top( )
)
+|| static_cast const SwPageFrm* ( pPrevPage )-IsEmptyPage(
) ) );
Rectangle aBoundRect = GetEditWin()-LogicToPixel(
pPageFrm-GetBoundRect().SVRect() );
Rectangle aFrmRect = GetEditWin()-LogicToPixel( pPageFrm-Frm().SVRect()
);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - connectivity/source offapi/com
connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx | 39 ++--
connectivity/source/drivers/odbcbase/OPreparedStatement.cxx |3
connectivity/source/inc/odbc/OBoundParam.hxx|2
offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 16 ++--
4 files changed, 18 insertions(+), 42 deletions(-)
New commits:
commit 84d21e4de26bd69f7ca5b10f2c72779f07e11347
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Feb 14 14:54:03 2012 +0100
odbc 64 bit crash: correct buffer length allocation for a SQLLEN
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx
b/connectivity/source/inc/odbc/OBoundParam.hxx
index 2310a2e..99a4901 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -68,7 +68,7 @@ namespace connectivity
// to a Java sal_Int32. The jdbcodbc 'C' bridge provides an
// interface to do this.
-paramLength = new sal_Int8[4];
+paramLength = new sal_Int8[sizeof(SQLLEN)];
}
//
commit 288cc968c4d1fa07b4f3cc106ea6934c4afd955a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Feb 14 09:49:19 2012 +0100
new[] already allocates each element of the array
And calls the default constructor, naturally.
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 2dbde52..63401f5 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -641,11 +641,10 @@ void OPreparedStatement::initBoundParam ()
throw(SQLException)
boundParams = new OBoundParam[numParams];
-// Allocate and initialize each bound parameter
+// initialize each bound parameter
for (sal_Int32 i = 0; i numParams; i++)
{
-boundParams[i] = OBoundParam();
boundParams[i].initialize ();
}
}
commit 50e5118710c84461b0e09dc0576e924ea149f6d4
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Feb 14 06:27:51 2012 +0100
odbc getTableTypes: ask the driver instead of guessing
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 093c6d9..783e259 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -728,43 +728,18 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(
) throw(SQLException,
// -
Reference XResultSet SAL_CALL ODatabaseMetaData::getTableTypes( )
throw(SQLException, RuntimeException)
{
-
-// there exists no possibility to get table types so we have to check
-static ::rtl::OUString sTableTypes[] =
-{
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TABLE)),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(VIEW)),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SYSTEM TABLE)),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(GLOBAL TEMPORARY)),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(LOCAL TEMPORARY)),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALIAS)),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SYNONYM))
-};
-sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString);
-::connectivity::ODatabaseMetaDataResultSet* pResult = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
-Reference XResultSet xRef = pResult;
-SQLUINTEGER nValue = 0;
+Reference XResultSet xRef;
try
{
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CREATE_VIEW,nValue,*this);
-}
-catch(const Exception)
-{
+ODatabaseMetaDataResultSet* pResult = new
ODatabaseMetaDataResultSet(m_pConnection);
+xRef = pResult;
+pResult-openTablesTypes();
}
-sal_Bool bViewsSupported = (nValue SQL_CV_CREATE_VIEW) ==
SQL_CV_CREATE_VIEW;
-
-::connectivity::ODatabaseMetaDataResultSet::ORows aRows;
-for(sal_Int32 i=0;i nSize;++i)
+catch(SQLException)
{
-if( !bViewsSupported i == 1)
-continue; // no views supported
-::connectivity::ODatabaseMetaDataResultSet::ORow aRow;
-
aRow.push_back(::connectivity::ODatabaseMetaDataResultSet::getEmptyValue());
-aRow.push_back(new
::connectivity::ORowSetValueDecorator(sTableTypes[i]));
-aRows.push_back(aRow);
+xRef = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
}
-pResult-setRows(aRows);
- return xRef;
+return xRef;
}
// -
[Libreoffice-commits] .: cppu/inc sal/inc
cppu/inc/cppu/macros.hxx |2 +- sal/inc/sal/config.h | 12 2 files changed, 1 insertion(+), 13 deletions(-) New commits: commit 3e41d0bf6a8d77ffa30889cf8b7ebdb5c7910792 Author: Michael Meeks michael.me...@suse.com Date: Tue Feb 14 14:14:38 2012 + cleanup: remove remenants of gcc version checking diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx index 78df315..3d99bc9 100644 --- a/cppu/inc/cppu/macros.hxx +++ b/cppu/inc/cppu/macros.hxx @@ -45,7 +45,7 @@ struct to become 8 instead of 4 if CPPU_GCC3_ALIGN were added to its first member.) */ -#if defined(__GNUC__) (__GNUC__ = 3) +#if defined(__GNUC__) #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct #else #define CPPU_GCC3_ALIGN( base_struct ) diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index e4ed257..aee8e82 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -116,18 +116,6 @@ #define sun sun #endif -/* This is to work around a gcc 3.3 error that fixing actually breaks other - * compilers. This will create a dummy variable specifically for gcc 3.3 that - * allows it to compile and not break the others. Other compilers may follow - * with this eror later. */ -#if defined __GNUC__ -#if ((__GNUC__ == 3) (__GNUC_MINOR__ 2)) -# define SAL_ISO_CONST const -#else -# define SAL_ISO_CONST -#endif -#endif - #endif /*_SAL_CONFIG_H_ */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com
offapi/com/sun/star/sdbc/XDatabaseMetaData.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf3c4f63d94b39c73858d3455ede1b10dac2fe7d Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 15:43:00 2012 +0100 plural right after all diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl index abee6d2..bf55630 100644 --- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl +++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl @@ -64,7 +64,7 @@ arguments all have names such as fooPattern. Within a pattern String, % means match any substring of 0 or more characters, and _ means match any one character. Only metadata entries matching the search pattern -is returned. If a search pattern argument is set to VOID/, +are returned. If a search pattern argument is set to VOID/, that argument's criteria will be dropped from the search. /p p ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/source
extensions/source/propctrlr/browserlistbox.cxx | 138 -
extensions/source/propctrlr/browserlistbox.hxx | 23 +---
2 files changed, 73 insertions(+), 88 deletions(-)
New commits:
commit d5d32eb755c8a53292acbf0648fb82baf6729d8a
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 10 14:12:17 2012 +0100
fdo#40261: Fix crash in XML Form Document.
The data structure holding the UI elements in the browser listbox was a
terrible mess - it held the items in an unordered_map, but then accessed
them via a vector containing iterators to this unordered_map.
Fixed the problem (and cleaned all this up) by removing the vector of
iterators, and turning the unordered_map into a normal vector. When we need
access by name, we just go through all the items; it is always just a
handful
of them anyway.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/extensions/source/propctrlr/browserlistbox.cxx
b/extensions/source/propctrlr/browserlistbox.cxx
index f635ea6..45ef9aa 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -470,7 +470,7 @@ namespace pcr
UpdateVScroll();
-sal_Bool bNeedScrollbar = m_aOrderedLines.size()
(sal_uInt32)CalcVisibleLines();
+sal_Bool bNeedScrollbar = m_aLines.size()
(sal_uInt32)CalcVisibleLines();
if ( !bNeedScrollbar )
{
if ( m_aVScroll.IsVisible() )
@@ -493,7 +493,7 @@ namespace pcr
m_aVScroll.SetPosSizePixel( aVScrollPos, aVScrollSize );
}
-for ( sal_uInt16 i = 0; i m_aOrderedLines.size(); ++i )
+for ( sal_uInt16 i = 0; i m_aLines.size(); ++i )
m_aOutOfDateLines.insert( i );
// repaint
@@ -595,15 +595,16 @@ namespace pcr
aPos.Y() += _nIndex * m_nRowHeight;
-if ( _nIndex m_aOrderedLines.size() )
+if ( _nIndex m_aLines.size() )
{
-m_aOrderedLines[ _nIndex ]-second.pLine-SetPosSizePixel( aPos,
aSize );
+BrowserLinePointer pLine = m_aLines[ _nIndex ].pLine;
-m_aOrderedLines[ _nIndex ]-second.pLine-SetTitleWidth(
m_nTheNameSize + 2 * FRAME_OFFSET );
+pLine-SetPosSizePixel( aPos, aSize );
+pLine-SetTitleWidth( m_nTheNameSize + 2 * FRAME_OFFSET );
// show the line if necessary
-if ( !m_aOrderedLines[ _nIndex ]-second.pLine-IsVisible() )
-m_aOrderedLines[ _nIndex ]-second.pLine-Show();
+if ( !pLine-IsVisible() )
+pLine-Show();
}
}
@@ -615,8 +616,8 @@ namespace pcr
++aLoop
)
{
-DBG_ASSERT( *aLoop m_aOrderedLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
-if ( *aLoop m_aOrderedLines.size() )
+DBG_ASSERT( *aLoop m_aLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
+if ( *aLoop m_aLines.size() )
PositionLine( *aLoop );
}
m_aOutOfDateLines.clear();
@@ -629,10 +630,10 @@ namespace pcr
sal_Int32 nLines = CalcVisibleLines();
sal_uInt16 nEnd = (sal_uInt16)(nThumbPos + nLines);
-if (nEnd = m_aOrderedLines.size())
-nEnd = (sal_uInt16)m_aOrderedLines.size()-1;
+if (nEnd = m_aLines.size())
+nEnd = (sal_uInt16)m_aLines.size()-1;
-if ( !m_aOrderedLines.empty() )
+if ( !m_aLines.empty() )
{
for ( sal_uInt16 i = (sal_uInt16)nThumbPos; i = nEnd; ++i )
m_aOutOfDateLines.insert( i );
@@ -662,18 +663,21 @@ namespace pcr
//--
void OBrowserListBox::SetPropertyValue(const ::rtl::OUString _rEntryName,
const Any _rValue, bool _bUnknownValue )
{
-ListBoxLines::iterator line = m_aLines.find( _rEntryName );
+ListBoxLines::iterator line = m_aLines.begin();
+for ( ; line != m_aLines.end() ( line-aName != _rEntryName );
++line )
+;
+
if ( line != m_aLines.end() )
{
if ( _bUnknownValue )
{
-Reference XPropertyControl xControl(
line-second.pLine-getControl() );
+Reference XPropertyControl xControl(
line-pLine-getControl() );
OSL_ENSURE( xControl.is(), OBrowserListBox::SetPropertyValue:
illegal control! );
if ( xControl.is() )
xControl-setValue( Any() );
}
else
-impl_setControlAsPropertyValue( line-second, _rValue );
+impl_setControlAsPropertyValue( *line, _rValue );
}
}
@@ -681,14 +685,14 @@ namespace pcr
sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString
_rEntryName ) const
{
sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND;
-for (
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 5 commits - connectivity/source odk/settings offapi/com solenv/gbuild writerfilter/source
connectivity/source/inc/odbc/OBoundParam.hxx |2 +-
odk/settings/std.mk|4 ++--
offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 16 +---
solenv/gbuild/Executable.mk|4
solenv/gbuild/Helper.mk|1 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +--
6 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 0a28ddf2084f86743e229667ae2c9b7e4f95e49e
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Feb 14 06:19:08 2012 +0100
correct documentation of com::sun::star::sdbc::XDatabaseMetaData
(cherry picked from commit 7535373fa693ddff5311054800efcc602cdcacd9)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
index 20dc8b3..ce07b4e 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
@@ -44,31 +44,33 @@
the form of
type scope=com::sun::star::sdbcXResultSet/type
objects.
-You can use the normal type scope=com::sun::star::sdbcXResultSet/type
+You can use the normal type scope=com::sun::star::sdbcXRow/type
+(or type scope=com::sun::star::sdbXColumn/type)
methods such as
-member scope=com::sun::star::sdbcXResultSet::getString()/member
+member scope=com::sun::star::sdbcXRow::getString()/member
and
-member scope=com::sun::star::sdbcXResultSet::getInt()/member
+member scope=com::sun::star::sdbcXRow::getInt()/member
to retrieve the data from these XResultSets. If a given form of
metadata is not available, these methods should throw a
type scope=com::sun::star::sdbcSQLException/type
.
-That a value of type scope=com::sun::star::sdbcXResultSet/type is
NULL/
-can be checked with the method member
scope=com::sun::star::sdbcXResultSet::wasNull()/member.
+After calling one of the getXXX() methods,
+one can check whether that value is NULL/
+with the method member
scope=com::sun::star::sdbcXRow::wasNull()/member.
In the text only (may be NULL/) is mentioned for this case.
/p
pSome of these methods take arguments that are String patterns. These
arguments all have names such as fooPattern. Within a pattern String, %
means match any substring of 0 or more characters, and _ means match
any one character. Only metadata entries matching the search pattern
-are returned. If a search pattern argument is set to VOID/,
+is returned. If a search pattern argument is set to VOID/,
that argument's criteria will be dropped from the search.
/p
p
A
type scope=com::sun::star::sdbcSQLException/type
will be thrown if a driver does not support
-a meta data method. In the case of methods that return an XResultSet,
+a metadata method. In the case of methods that return an XResultSet,
either an XResultSet (which may be empty) is returned or a
SQLException is thrown./p
*/
commit b88db173e610da5058099d5524e8fa7db2fc733d
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Feb 13 12:52:21 2012 +0100
n#695479 fix RTF import of text frames with exact height
(cherry picked from commit e0328096dc21ce12d15db2045074e7860872570f)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f0aa513..df60ff7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3375,6 +3375,7 @@ RTFSprms RTFFrame::getSprms()
{
NS_ooxml::LN_CT_FramePr_x,
NS_ooxml::LN_CT_FramePr_y,
+NS_ooxml::LN_CT_FramePr_hRule, // Make sure nHRule is processed before
nH
NS_sprm::LN_PWHeightAbs,
NS_sprm::LN_PDxaWidth,
NS_sprm::LN_PDxaFromText,
@@ -3385,8 +3386,7 @@ RTFSprms RTFFrame::getSprms()
NS_ooxml::LN_CT_FramePr_yAlign,
NS_sprm::LN_PWr,
NS_ooxml::LN_CT_FramePr_dropCap,
-NS_ooxml::LN_CT_FramePr_lines,
-NS_ooxml::LN_CT_FramePr_hRule
+NS_ooxml::LN_CT_FramePr_lines
};
for ( int i = 0, len = sizeof( pNames ) / sizeof( Id ); i len; ++i )
@@ -3438,7 +3438,10 @@ RTFSprms RTFFrame::getSprms()
{
sal_Int32 nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto;
if ( nH 0 )
+{
nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact;
+nH = -nH; // The negative value just sets nHRule
+}
else if ( nH 0 )
nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast;
pValue.reset(new RTFValue(nHRule));
commit f3f925c8a4784cf578d2ab2d1b3f593f582bcdbc
Author: Lionel Elie
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/source
connectivity/source/inc/odbc/OBoundParam.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit adb1ed5f13b4638690ca2966138eb2c61bdb1b53 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 14:54:03 2012 +0100 odbc 64 bit crash: correct buffer length allocation for a SQLLEN (cherry picked from commit 84d21e4de26bd69f7ca5b10f2c72779f07e11347) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 5817aac..b8856e9 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -68,7 +68,7 @@ namespace connectivity // to a Java sal_Int32. The jdbcodbc 'C' bridge provides an // interface to do this. -paramLength = new sal_Int8[4]; +paramLength = new sal_Int8[sizeof(SQLLEN)]; } // ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - extensions/source
extensions/source/propctrlr/browserlistbox.cxx | 138 -
extensions/source/propctrlr/browserlistbox.hxx | 23 +---
2 files changed, 73 insertions(+), 88 deletions(-)
New commits:
commit af14dfc2b5cf9d46ff8e425fdf6dee0978b7c135
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 10 14:12:17 2012 +0100
fdo#40261: Fix crash in XML Form Document.
The data structure holding the UI elements in the browser listbox was a
terrible mess - it held the items in an unordered_map, but then accessed
them via a vector containing iterators to this unordered_map.
Fixed the problem (and cleaned all this up) by removing the vector of
iterators, and turning the unordered_map into a normal vector. When we need
access by name, we just go through all the items; it is always just a
handful
of them anyway.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/extensions/source/propctrlr/browserlistbox.cxx
b/extensions/source/propctrlr/browserlistbox.cxx
index b24bc99..7eb1fcf 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -472,7 +472,7 @@ namespace pcr
UpdateVScroll();
-sal_Bool bNeedScrollbar = m_aOrderedLines.size()
(sal_uInt32)CalcVisibleLines();
+sal_Bool bNeedScrollbar = m_aLines.size()
(sal_uInt32)CalcVisibleLines();
if ( !bNeedScrollbar )
{
if ( m_aVScroll.IsVisible() )
@@ -495,7 +495,7 @@ namespace pcr
m_aVScroll.SetPosSizePixel( aVScrollPos, aVScrollSize );
}
-for ( sal_uInt16 i = 0; i m_aOrderedLines.size(); ++i )
+for ( sal_uInt16 i = 0; i m_aLines.size(); ++i )
m_aOutOfDateLines.insert( i );
// repaint
@@ -597,15 +597,16 @@ namespace pcr
aPos.Y() += _nIndex * m_nRowHeight;
-if ( _nIndex m_aOrderedLines.size() )
+if ( _nIndex m_aLines.size() )
{
-m_aOrderedLines[ _nIndex ]-second.pLine-SetPosSizePixel( aPos,
aSize );
+BrowserLinePointer pLine = m_aLines[ _nIndex ].pLine;
-m_aOrderedLines[ _nIndex ]-second.pLine-SetTitleWidth(
m_nTheNameSize + 2 * FRAME_OFFSET );
+pLine-SetPosSizePixel( aPos, aSize );
+pLine-SetTitleWidth( m_nTheNameSize + 2 * FRAME_OFFSET );
// show the line if necessary
-if ( !m_aOrderedLines[ _nIndex ]-second.pLine-IsVisible() )
-m_aOrderedLines[ _nIndex ]-second.pLine-Show();
+if ( !pLine-IsVisible() )
+pLine-Show();
}
}
@@ -617,8 +618,8 @@ namespace pcr
++aLoop
)
{
-DBG_ASSERT( *aLoop m_aOrderedLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
-if ( *aLoop m_aOrderedLines.size() )
+DBG_ASSERT( *aLoop m_aLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
+if ( *aLoop m_aLines.size() )
PositionLine( *aLoop );
}
m_aOutOfDateLines.clear();
@@ -631,10 +632,10 @@ namespace pcr
sal_Int32 nLines = CalcVisibleLines();
sal_uInt16 nEnd = (sal_uInt16)(nThumbPos + nLines);
-if (nEnd = m_aOrderedLines.size())
-nEnd = (sal_uInt16)m_aOrderedLines.size()-1;
+if (nEnd = m_aLines.size())
+nEnd = (sal_uInt16)m_aLines.size()-1;
-if ( !m_aOrderedLines.empty() )
+if ( !m_aLines.empty() )
{
for ( sal_uInt16 i = (sal_uInt16)nThumbPos; i = nEnd; ++i )
m_aOutOfDateLines.insert( i );
@@ -664,18 +665,21 @@ namespace pcr
//--
void OBrowserListBox::SetPropertyValue(const ::rtl::OUString _rEntryName,
const Any _rValue, bool _bUnknownValue )
{
-ListBoxLines::iterator line = m_aLines.find( _rEntryName );
+ListBoxLines::iterator line = m_aLines.begin();
+for ( ; line != m_aLines.end() ( line-aName != _rEntryName );
++line )
+;
+
if ( line != m_aLines.end() )
{
if ( _bUnknownValue )
{
-Reference XPropertyControl xControl(
line-second.pLine-getControl() );
+Reference XPropertyControl xControl(
line-pLine-getControl() );
OSL_ENSURE( xControl.is(), OBrowserListBox::SetPropertyValue:
illegal control! );
if ( xControl.is() )
xControl-setValue( Any() );
}
else
-impl_setControlAsPropertyValue( line-second, _rValue );
+impl_setControlAsPropertyValue( *line, _rValue );
}
}
@@ -683,14 +687,14 @@ namespace pcr
sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString
_rEntryName ) const
{
sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND;
-for (
[Libreoffice-commits] .: 2 commits - sc/source sw/CppunitTest_sw_layout_test.mk sw/qa
sc/source/ui/namedlg/namedlg.cxx |6 - sw/CppunitTest_sw_layout_test.mk | 139 +++ sw/qa/core/data/odt/test.odt |binary sw/qa/core/layout-test.cxx | 127 +++ 4 files changed, 266 insertions(+), 6 deletions(-) New commits: commit 156bd43bd96379d86535afa38ce4d4f8044f45a6 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Feb 14 16:34:47 2012 +0100 add a test case that allows testing of sw's Layout code diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk new file mode 100644 index 000..a14af32 --- /dev/null +++ b/sw/CppunitTest_sw_layout_test.mk @@ -0,0 +1,139 @@ +# -*- 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 Red Hat, Inc., Caolán McNamara caol...@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_CppunitTest_CppunitTest,sw_layout_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \ +sw/qa/core/layout-test \ +)) + +$(eval $(call gb_CppunitTest_add_linked_libs,sw_layout_test, \ +avmedia \ +basegfx \ +comphelper \ +cppu \ +cppuhelper \ +drawinglayer \ +editeng \ +fileacc \ +for \ +forui \ +i18nisolang1 \ +msfilter \ +oox \ +sal \ +salhelper \ +sax \ +sw \ +sfx \ +sot \ +svl \ +svt \ +svx \ +svxcore \ + test \ +tl \ +tk \ +ucbhelper \ + unotest \ +utl \ +vbahelper \ +vcl \ +xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_layout_test,\ +-I$(realpath $(SRCDIR)/sw/source/ui/inc) \ +-I$(realpath $(SRCDIR)/sw/inc) \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_add_api,sw_layout_test,\ +offapi \ +oovbaapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_uses_ure,sw_layout_test)) + +$(eval $(call gb_CppunitTest_add_type_rdbs,sw_layout_test,\ +oovbaapi \ +types \ +)) + +$(eval $(call gb_CppunitTest_add_components,sw_layout_test,\ +comphelper/util/comphelp \ +configmgr/source/configmgr \ +dbaccess/util/dba \ +fileaccess/source/fileacc \ +filter/source/config/cache/filterconfig1 \ +forms/util/frm \ +framework/util/fwk \ +i18npool/util/i18npool \ +oox/util/oox \ +package/source/xstor/xstor \ +package/util/package2 \ +sax/source/expatwrap/expwrap \ +sax/source/fastparser/fastsax \ +sw/util/sw \ +sw/util/swd \ +sw/util/msword \ +sw/util/vbaswobj \ +scripting/source/basprov/basprov \ +scripting/util/scriptframe \ +sfx2/util/sfx \ +sot/util/sot \ +svl/source/fsstor/fsstorage \ +toolkit/util/tk \ +ucb/source/core/ucb1 \ +ucb/source/ucp/file/ucpfile1 \ +ucb/source/ucp/tdoc/ucptdoc1 \ +unotools/util/utl \ +unoxml/source/rdf/unordf \ +unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_CppunitTest_set_args,sw_layout_test,\ +--headless \ +--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ +-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry) \ +)) +# .../spool is required for the (somewhat strange) filter configuration + +# we need to +# a) explicitly depend on library msword because it is not implied by a link +#relation +# b) explicitly depend on the sw resource files needed at unit-test runtime +$(call gb_CppunitTest_get_target,sw_layout_test) : \ +$(call gb_Library_get_target,localedata_en) \ +$(call gb_Library_get_target,msword) \ +$(call gb_Library_get_target,vbaswobj) \ + +# vim: set noet sw=4 ts=4: diff --git
[Libreoffice-commits] .: 3 commits - i18npool/qa i18npool/source
i18npool/qa/cppunit/test_breakiterator.cxx | 35 +++-
i18npool/source/breakiterator/breakiterator_unicode.cxx |7 ++-
2 files changed, 39 insertions(+), 3 deletions(-)
New commits:
commit 475d0c59c66fb7752d230f76130b17145aad0c12
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 14 16:07:10 2012 +
use icu's breakiterator for Thai, not our customized generic rules
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index ba000af..820e57b 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -70,7 +70,7 @@ public:
CPPUNIT_TEST(testGraphemeIteration);
CPPUNIT_TEST(testWeak);
CPPUNIT_TEST(testAsian);
-//CPPUNIT_TEST(testThai);
+CPPUNIT_TEST(testThai);
CPPUNIT_TEST_SUITE_END();
private:
@@ -264,13 +264,13 @@ void TestBreakIterator::testThai()
{
const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32,
0x0E1A };
::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-
aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_MESSAGE(Should skip full word,
aBounds.startPos == 0 aBounds.endPos == aTest.getLength());
}
+#ifdef TODO
{
const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B,
0x0E25, 0x0E32, 0x0E1A };
::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
@@ -279,6 +279,7 @@ void TestBreakIterator::testThai()
CPPUNIT_ASSERT_MESSAGE(Should skip full word,
aBounds.startPos == 0 aBounds.endPos == aTest.getLength());
}
+#endif
}
TestBreakIterator::TestBreakIterator()
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 5f35795..aa5e1d8 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -129,10 +129,13 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
OOoRuleBasedBreakIterator *rbi = NULL;
-if (breakRules.getLength() breakType
!breakRules[breakType].isEmpty()) {
+if (breakRules.getLength() breakType
!breakRules[breakType].isEmpty())
+{
rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice,
brk,
OUStringToOString(breakRules[breakType],
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
-} else {
+}
+else if
(!rLocale.Language.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(th))) //use icu's
breakiterator for Thai
+{
status = U_ZERO_ERROR;
OStringBuffer aUDName(64);
aUDName.append(rule);
commit fad63878e529ad775f4484330235242a7a900987
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 14 14:14:23 2012 +
add northern-thai example
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index a68bc77..ba000af 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -260,14 +260,24 @@ void TestBreakIterator::testThai()
aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(th));
aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TH));
+i18n::Boundary aBounds;
{
const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32,
0x0E1A };
-::rtl::OUString aTest1(THAI1, SAL_N_ELEMENTS(THAI1));
+::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-i18n::Boundary aBounds = m_xBreak-getWordBoundary(aTest1, 0, aLocale,
+aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_MESSAGE(Should skip full word,
-aBounds.startPos == 0 aBounds.endPos == aTest1.getLength());
+aBounds.startPos == 0 aBounds.endPos == aTest.getLength());
+}
+
+{
+const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B,
0x0E25, 0x0E32, 0x0E1A };
+::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
+aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
+i18n::WordType::DICTIONARY_WORD, true);
+CPPUNIT_ASSERT_MESSAGE(Should skip full word,
+aBounds.startPos == 0 aBounds.endPos == aTest.getLength());
}
}
commit 1a450f53dbd31a34718f658a81b0fabbbc329764
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 14 14:09:12 2012 +
add a unit test to demo broken thai word-boundary detection
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 661e46a..a68bc77 100644
---
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/sfxpicklist.cxx | 109 +++
sfx2/source/doc/objserv.cxx |3 -
sfx2/source/doc/objstor.cxx |2
sfx2/source/doc/objxtor.cxx |1
sfx2/source/inc/objshimp.hxx |1
sfx2/source/inc/sfxpicklist.hxx |6 ++
6 files changed, 71 insertions(+), 51 deletions(-)
New commits:
commit 2e01faac3fa50f7036093583ae52f1584b3de55c
Author: Muhammad Haggag mhag...@gmail.com
Date: Tue Feb 14 10:46:46 2012 +0200
fdo#37775: Recent Documents not updated by Save Save As
This patch changes LO behavior so that we update recent documents on file
save, save as, save all, and close. The previous behavior was to only update
the list on document close.
= Changes =
SfxPickList (sfxpicklist.cxx/hxx):
. Extracted the logic to add a document to the Recent Documents list
into a function of its own: AddDocumentToPickList
- Simplified the logic used by removing the check of
SfxObjectShell_impl::bWaitingForPickList (see
SfxObjectShell_impl::bWaitingForPickList below for details)
. Modified SfxPickList::Notify to call the aforementioned function on
save, save-to, and save-as.
SfxObjectShell::APISaveAs_Impl (objserv.cxx):
. Modified it to allow picklist entry when doing Save As.
SfxObjectShell_impl::bWaitingForPickList (objstor.cxx, objxtor.cxx,
objshimp.hxx):
. Removed this flag. It was used to indicate that a document wants to
be added to the picklist, then cleared after it's added. Since we now always
add documents to the picklist on saving, we no longer need it.
= Verification =
The change is in sfx2, so it should apply to all LO apps. I verified the
new behavior in both writer and calc with the following actions:
. File-Save
. File-Save As
. File-Save All
. File-Close
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index b0169a5..1198732 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -164,6 +164,52 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry(
sal_uInt32 nIndex )
return 0;
}
+void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
+{
+SfxMedium *pMed = pDocSh-GetMedium();
+if( !pMed )
+return;
+
+// Unnamed Documents and embedded-Documents not in Picklist
+if ( !pDocSh-HasName() ||
+SFX_CREATE_MODE_STANDARD != pDocSh-GetCreateMode() )
+return;
+
+// Help not in History
+INetURLObject aURL( pDocSh-IsDocShared() ? pDocSh-GetSharedFileURL() :
::rtl::OUString( pMed-GetOrigURL() ) );
+if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP )
+return;
+
+// only add r/w document into picklist
+if ( pDocSh-IsReadOnly() || !pMed-IsUpdatePickList() )
+return;
+
+// add no document that forbids this (for example Message-Body)
+SFX_ITEMSET_ARG( pMed-GetItemSet(), pPicklistItem, SfxBoolItem,
SID_PICKLIST, sal_False );
+if ( pPicklistItem !pPicklistItem-GetValue() )
+return;
+
+// ignore hidden documents
+if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) )
+return;
+
+::rtl::OUString aTitle = pDocSh-GetTitle(SFX_TITLE_PICKLIST);
+::rtl::OUString aFilter;
+const SfxFilter* pFilter = pMed-GetOrigFilter();
+if ( pFilter )
+aFilter = pFilter-GetFilterName();
+
+// add to svtool history options
+SvtHistoryOptions().AppendItem( ePICKLIST,
+aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
+aFilter,
+aTitle,
+SfxStringEncode( aURL.GetPass() ) );
+
+if ( aURL.GetProtocol() == INET_PROT_FILE )
+Application::AddToRecentDocumentList( aURL.GetURLNoPass(
INetURLObject::NO_DECODE ), (pFilter) ? pFilter-GetMimeType() :
::rtl::OUString() );
+}
+
SfxPickList SfxPickList::Get()
{
static SfxPickList aUniqueInstance(SvtHistoryOptions().GetSize(ePICKLIST));
@@ -375,55 +421,30 @@ void SfxPickList::Notify( SfxBroadcaster, const SfxHint
rHint )
}
break;
+case SFX_EVENT_SAVEDOCDONE:
+case SFX_EVENT_SAVEASDOCDONE:
+case SFX_EVENT_SAVETODOCDONE:
case SFX_EVENT_CLOSEDOC:
{
-SfxMedium *pMed = pDocSh-GetMedium();
-if( !pMed )
-return;
-
-// Unnamed Documents and embedded-Documents not im Pickliste
-if ( !pDocSh-HasName() ||
- SFX_CREATE_MODE_STANDARD != pDocSh-GetCreateMode() )
-return;
-
-// Help not in History
-INetURLObject aURL( pDocSh-IsDocShared() ?
pDocSh-GetSharedFileURL() : ::rtl::OUString( pMed-GetOrigURL() ) );
-if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP )
-return;
-
-// only add r/w document into picklist
[Libreoffice-commits] .: editeng/inc editeng/source unusedcode.easy
editeng/inc/editeng/numitem.hxx |1 -
editeng/source/items/numitem.cxx | 17 -
unusedcode.easy |1 -
3 files changed, 19 deletions(-)
New commits:
commit 1dc612970f57aa5599c6d1b7afb10a3f5f4403d2
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Feb 13 22:31:23 2012 +0100
Remove unused code.
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 1084ea1..ea34a7f 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -278,7 +278,6 @@ public:
const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
const SvxNumberFormat GetLevel(sal_uInt16 nLevel)const;
voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat
rFmt, sal_Bool bIsValid = sal_True);
-voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat*
pFmt);
sal_BoolIsContinuousNumbering()const
{return bContinuousNumbering;}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 01fc463..ccb3455 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -759,23 +759,6 @@ void SvxNumRule::SetLevel( sal_uInt16 i, const
SvxNumberFormat rNumFmt, sal_Boo
}
}
-void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
-{
-DBG_ASSERT(nLevel SVX_MAX_NUM, Wrong Level );
-
-if( nLevel SVX_MAX_NUM )
-{
-aFmtsSet[nLevel] = 0 != pFmt;
-if(pFmt)
-SetLevel(nLevel, *pFmt);
-else
-{
-delete aFmts[nLevel];
-aFmts[nLevel] = 0;
-}
-}
-}
-
String SvxNumRule::MakeNumString( const SvxNodeNum rNum, sal_Bool
bInclStrings ) const
{
String aStr;
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a40c2f..5142e88 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -369,7 +369,6 @@ SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*,
unsigned short)
SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short,
unsigned short)
SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const, unsigned short)
SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
-SvxNumRule::SetLevel(unsigned short, SvxNumberFormat const*)
SvxOpenGraphicDialog::SetControlHelpIds(short const*, char const**)
SvxPluginFileDlg::IsAvailable(unsigned short)
SvxPopupWindowListBox::StartSelection()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - basic/source odk/settings readlicense_oo/docs salhelper/test solenv/inc svl/inc
basic/source/sbx/sbxvalue.cxx | 23 ---
odk/settings/settings.mk| 10 --
readlicense_oo/docs/readme.dtd |3 +--
salhelper/test/rtti/makefile.mk |6 --
solenv/inc/doxygen.cfg |2 --
solenv/inc/tg_compv.mk |5 -
svl/inc/svl/svarray.hxx |7 ---
7 files changed, 1 insertion(+), 55 deletions(-)
New commits:
commit 9b3372d8f0d59c8bf6789974d04733dff30bd131
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:37:25 2012 +0100
Remove some more outdated sunpro traces
On Solaris gcc should be used. See:
514cefbcb7b800f8ddd2aa595502f4fe8403882f
19480ddf483174e956bd658b76380dbe499678dd
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 6907497..d500ca6 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -738,12 +738,6 @@ SV_IMPL_VARARR(nm##_SAR, AE)\
_SV_IMPL_SORTAR_ALG( nm,AE )\
_SV_SEEK_OBJECT( nm,AE )
-#if defined(C40) || defined(C41) || defined(C42) || defined(C50)
-#define C40_INSERT( c, p, n) Insert( (c const *) p, n )
-#define C40_PTR_INSERT( c, p) Insert( (c const *) p )
-#define C40_REPLACE( c, p, n) Replace( (c const *) p, n )
-#define C40_GETPOS( c, r) GetPos( (c const *)r )
-#else
#if defined(ICC) || defined(GCC) || (defined(WNT) _MSC_VER = 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *) p, n )
#define C40_PTR_INSERT( c, p ) Insert( (c const *) p )
@@ -755,7 +749,6 @@ _SV_SEEK_OBJECT( nm,AE )
#define C40_REPLACE( c, p, n ) Replace( p, n )
#define C40_GETPOS( c, r) GetPos( r )
#endif
-#endif
#endif //_SVARRAY_HXX
commit 5cf9115058beab8e1179d55f0edca5d32e6aaa31
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:32:28 2012 +0100
move CVER traces (sunpro compiler)
diff --git a/readlicense_oo/docs/readme.dtd b/readlicense_oo/docs/readme.dtd
index f893d54..d404451 100755
--- a/readlicense_oo/docs/readme.dtd
+++ b/readlicense_oo/docs/readme.dtd
@@ -14,7 +14,7 @@
gui (all | UNX | WNT) all
os (none | all | SOLARIS | LINUX | WNT | MACOSX) all
cpuname (all | SPARC | INTEL | POWERPC) all
- com (all | C50 | C52 | GCC | MSC) all
+ com (all | GCC | MSC) all
localized (true | false) true
style (P | H1 | H2 | H3 | HR) P
@@ -30,4 +30,4 @@
!ELEMENT List (Text | Paragraph)+
!ATTLIST List
Enum (true | false) false
-
\ No newline at end of file
+
commit 72e04abea5b881f29c63bc4beaf48bddabe39a15
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:30:43 2012 +0100
remove sunpro 5.0 handling
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f4aab28..be36119 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -205,32 +205,9 @@ SbxValue SbxValue::operator=( const SbxValue r )
SbxValue::~SbxValue()
{
-#ifndef C50
Broadcast( SBX_HINT_DYING );
SetFlag( SBX_WRITE );
SbxValue::Clear();
-#else
-// Provisional fix for the Solaris 5.0 compiler bbug
-// at using virtual inheritance. Avoid virtual calls
-// in the destructor. Instead of calling clear()
-// de-allocate posible object references direct.
-if( aData.eType == SbxOBJECT )
-{
-if( aData.pObj aData.pObj != this )
-{
-HACK(nicht bei Parent-Prop - sonst CyclicRef)
-SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-sal_Bool bParentProp = pThisVar 5345 ==
-( (sal_Int16) ( pThisVar-GetUserData() 0x ) );
-if ( !bParentProp )
-aData.pObj-ReleaseRef();
-}
-}
-else if( aData.eType == SbxDECIMAL )
-{
-releaseDecimalPtr( aData.pDecimal );
-}
-#endif
}
void SbxValue::Clear()
commit 104613ffb7e94a421994977ebcb85d142ad64a9f
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:28:35 2012 +0100
Remove CVER traces
see 08d49db2aac06ddc9d8c8ad7f34bee3a899e2fa9
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 7aa1548..b1a443a 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1059,10 +1059,8 @@ PREDEFINED = LINUX \
UNX \
VCL \
GCC \
- C341 \
X86_64 \
_DEBUG_RUNTIME \
- VER=C341 \
NPTL \
GLIBC=2 \
NEW_SOLAR \
commit 61ebddf9f41073b2b9b41dae0862d40d0018a6bf
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Feb 14 14:20:31 2012 +0100
salhelper: remove unexisting maps
diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk
index b835780..e87182c 100644
--- a/salhelper/test/rtti/makefile.mk
+++ b/salhelper/test/rtti/makefile.mk
@@ -73,10 +73,6 @@ DEF1NAME=$(SHL1TARGET)
.IF $(OS)$(CPU)==SOLARISS
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 34 --- 1 file changed, 25 insertions(+), 9 deletions(-) New commits: commit 545a55895acfe15a454ca701eff7197eb8dbc3f3 Author: Tomcsik Bence tomcsikbe...@gmail.com Date: Tue Feb 14 18:25:47 2012 +0100 fix layout of checkboxes on Extension Manager dialog fdo#45851 I changed the sizes and the positions of the checkboxes. So there won't be truncated checkboxes in any languages. diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 416e567..39606f1 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1244,16 +1244,32 @@ void ExtMgrDialog::Resize() // checkboxes + text type of extensions -Size aCBSize(m_aBundledCbx.GetSizePixel()); - -offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT - 3*(aCBSize.Width() + RSC_SP_CTRL_GROUP_X) ); +long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() ); +Size aBCBSize(m_aBundledCbx.GetSizePixel()); +aBCBSize.Width() = nWidth + 30; +aBCBSize.Height() += 3; +m_aBundledCbx.SetSizePixel( aBCBSize ); + +nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() ); +Size aSCBSize(m_aSharedCbx.GetSizePixel()); +aSCBSize.Width() = nWidth + 30; +aSCBSize.Height() += 3; +m_aSharedCbx.SetSizePixel( aSCBSize ); + +nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() ); +Size aUCBSize(m_aUserCbx.GetSizePixel()); +aUCBSize.Width() = nWidth + 30; +aUCBSize.Height() += 3; +m_aUserCbx.SetSizePixel( aUCBSize ); + +offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - aSCBSize.Width() - aUCBSize.Width() ); aPos = Point(offsetX, aPos.Y() - RSC_CD_CHECKBOX_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM); -m_aBundledCbx.SetPosSizePixel(aPos, aCBSize); -aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X; -m_aSharedCbx.SetPosSizePixel(aPos, aCBSize); -aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X; -m_aUserCbx.SetPosSizePixel(aPos, aCBSize); +m_aBundledCbx.SetPosPixel( aPos ); +aPos.X() += aBCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X; +m_aSharedCbx.SetPosPixel( aPos ); +aPos.X() += aSCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X; +m_aUserCbx.SetPosPixel( aPos ); Size aFTTypeOfExtSize(m_aTypeOfExtTxt.GetSizePixel()); aPos = Point(RSC_SP_DLG_INNERBORDER_LEFT , aPos.Y() - RSC_CD_FIXEDTEXT_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM); @@ -1269,7 +1285,7 @@ void ExtMgrDialog::Resize() Size aSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT, aTotalSize.Height() - aBtnSize.Height() - LINE_SIZE - aBtnSize.Height() -- aCBSize.Height() - aFTTypeOfExtSize.Height() +- aBCBSize.Height() - aFTTypeOfExtSize.Height() - RSC_SP_DLG_INNERBORDER_TOP - 5*RSC_SP_DLG_INNERBORDER_BOTTOM ); m_pExtensionBox-SetSizePixel(aSize ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/xtable.hxx|1 -
svx/source/xoutdev/xtable.cxx | 15 ---
unusedcode.easy |1 -
3 files changed, 17 deletions(-)
New commits:
commit 8af1b357b1c87c9f3eea7660881b2ffacc133f58
Author: Santiago Martinez smvar...@gmail.com
Date: Mon Feb 13 21:52:07 2012 +0100
Remove unused code.
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index a5f2197..eaca035 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -238,7 +238,6 @@ protected:
XPropertyList( XPropertyListType t, const String
rPath,
XOutdevItemPool* pXPool = NULL );
-voidClear();
public:
virtual ~XPropertyList();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 1eedd7a..9d18cc0 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -91,21 +91,6 @@ XPropertyList::~XPropertyList()
SfxItemPool::Free(pXPool);
}
-void XPropertyList::Clear()
-{
-for( size_t i = 0, n = aList.size(); i n; ++i ) {
-delete aList[ i ];
-}
-aList.clear();
-if( pBmpList )
-{
-for ( size_t i = 0, n = pBmpList-size(); i n; ++i ) {
-delete (*pBmpList)[ i ];
-}
-pBmpList-clear();
-}
-}
-
long XPropertyList::Count() const
{
if( bListDirty )
diff --git a/unusedcode.easy b/unusedcode.easy
index 5142e88..95f65eb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -622,7 +622,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl
const*) const
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
XMLVisAreaContext::XMLVisAreaContext(SvXMLImport, unsigned short,
rtl::OUString const,
com::sun::star::uno::Referencecom::sun::star::xml::sax::XAttributeList
const, Rectangle, short)
-XPropertyList::Clear()
XWindowItem::XWindowItem(unsigned short, Window*)
XWindowItem::XWindowItem(unsigned short,
com::sun::star::uno::Referencecom::sun::star::awt::XWindow)
XclExpFontBuffer::Insert(ScPatternAttr const, short, XclExpColorType, bool)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/source
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 34 --- 1 file changed, 25 insertions(+), 9 deletions(-) New commits: commit ef95aa6facbefaa49a8c9b3b6bb2a88b0fb3df83 Author: Tomcsik Bence tomcsikbe...@gmail.com Date: Tue Feb 14 18:25:47 2012 +0100 fix layout of checkboxes on Extension Manager dialog fdo#45851 I changed the sizes and the positions of the checkboxes. So there won't be truncated checkboxes in any languages. Signed-off-by: Andras Timar ati...@suse.com diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 7199aaf..de324ef 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1244,16 +1244,32 @@ void ExtMgrDialog::Resize() // checkboxes + text type of extensions -Size aCBSize(m_aBundledCbx.GetSizePixel()); - -offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT - 3*(aCBSize.Width() + RSC_SP_CTRL_GROUP_X) ); +long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() ); +Size aBCBSize(m_aBundledCbx.GetSizePixel()); +aBCBSize.Width() = nWidth + 30; +aBCBSize.Height() += 3; +m_aBundledCbx.SetSizePixel( aBCBSize ); + +nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() ); +Size aSCBSize(m_aSharedCbx.GetSizePixel()); +aSCBSize.Width() = nWidth + 30; +aSCBSize.Height() += 3; +m_aSharedCbx.SetSizePixel( aSCBSize ); + +nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() ); +Size aUCBSize(m_aUserCbx.GetSizePixel()); +aUCBSize.Width() = nWidth + 30; +aUCBSize.Height() += 3; +m_aUserCbx.SetSizePixel( aUCBSize ); + +offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - aSCBSize.Width() - aUCBSize.Width() ); aPos = Point(offsetX, aPos.Y() - RSC_CD_CHECKBOX_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM); -m_aBundledCbx.SetPosSizePixel(aPos, aCBSize); -aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X; -m_aSharedCbx.SetPosSizePixel(aPos, aCBSize); -aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X; -m_aUserCbx.SetPosSizePixel(aPos, aCBSize); +m_aBundledCbx.SetPosPixel( aPos ); +aPos.X() += aBCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X; +m_aSharedCbx.SetPosPixel( aPos ); +aPos.X() += aSCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X; +m_aUserCbx.SetPosPixel( aPos ); Size aFTTypeOfExtSize(m_aTypeOfExtTxt.GetSizePixel()); aPos = Point(RSC_SP_DLG_INNERBORDER_LEFT , aPos.Y() - RSC_CD_FIXEDTEXT_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM); @@ -1269,7 +1285,7 @@ void ExtMgrDialog::Resize() Size aSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT, aTotalSize.Height() - aBtnSize.Height() - LINE_SIZE - aBtnSize.Height() -- aCBSize.Height() - aFTTypeOfExtSize.Height() +- aBCBSize.Height() - aFTTypeOfExtSize.Height() - RSC_SP_DLG_INNERBORDER_TOP - 5*RSC_SP_DLG_INNERBORDER_BOTTOM ); m_pExtensionBox-SetSizePixel(aSize ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/fr_CH.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 5930f866b649db40e6ddfd5004d4133ccbb0ede0 Author: Eike Rathke er...@redhat.com Date: Tue Feb 14 19:43:45 2012 +0100 added [fr-CH] date acceptance patterns D/M and D.M. diff --git a/i18npool/source/localedata/data/fr_CH.xml b/i18npool/source/localedata/data/fr_CH.xml index d60fab3..13ea410 100644 --- a/i18npool/source/localedata/data/fr_CH.xml +++ b/i18npool/source/localedata/data/fr_CH.xml @@ -38,6 +38,8 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD/M/DateAcceptancePattern +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - comphelper/inc comphelper/source connectivity/source
comphelper/inc/comphelper/types.hxx |1
comphelper/source/misc/types.cxx|8 +
connectivity/source/drivers/odbcbase/OPreparedStatement.cxx | 77
connectivity/source/drivers/odbcbase/OStatement.cxx | 18 +-
connectivity/source/drivers/odbcbase/OTools.cxx | 11 +
connectivity/source/inc/odbc/OPreparedStatement.hxx |4
connectivity/source/inc/odbc/OStatement.hxx |6
connectivity/source/inc/odbc/OTools.hxx | 20 +--
8 files changed, 41 insertions(+), 104 deletions(-)
New commits:
commit c8d91a8f2f6780cd187c65660ebf18e5eea568bc
Author: Kate Goss katherine.g...@gmail.com
Date: Mon Feb 13 21:53:08 2012 +
Remove unused code from connectivity::odbc::OPreparedStatement
Remove methods getDataBuf(int), getParamLength(int), getPrecision(int).
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 63401f5..d1288f9 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -674,27 +674,6 @@ sal_Int8* OPreparedStatement::allocBindBuf( sal_Int32
index,sal_Int32 bufLen)
// -
//
-// getDataBuf
-// Gets the data buffer for the given parameter index
-//
-
-sal_Int8* OPreparedStatement::getDataBuf (sal_Int32 index)
-{
-sal_Int8* b = NULL;
-
-// Sanity check the parameter number
-
-if ((index = 1)
-(index = numParams))
-{
-b = boundParams[index - 1].getBindDataBuffer ();
-}
-
-return b;
-}
-// -
-
-//
// getLengthBuf
// Gets the length buffer for the given parameter index
//
@@ -716,34 +695,6 @@ sal_Int8* OPreparedStatement::getLengthBuf (sal_Int32
index)
// -
//
-// getParamLength
-// Returns the length of the given parameter number. When each
-// parameter was bound, a 4-sal_Int8 buffer was given to hold the
-// length (stored in native format). Get the buffer, convert the
-// buffer from native format, and return it. If the length is -1,
-// the column is considered to be NULL.
-//
-
-sal_Int32 OPreparedStatement::getParamLength ( sal_Int32 index)
-{
-sal_Int32 paramLen = SQL_NULL_DATA;
-
-// Sanity check the parameter number
-
-if ((index = 1)
-(index = numParams)) {
-
-// Now get the length of the parameter from the
-// bound param array. -1 is returned if it is NULL.
-long n = 0;
-memcpy (n, boundParams[index -1].getBindLengthBuffer (), sizeof (n));
-paramLen = n;
-}
-return paramLen;
-}
-// -
-
-//
// putParamData
// Puts parameter data from a previously bound input stream. The
// input stream was bound using SQL_LEN_DATA_AT_EXEC.
@@ -810,34 +761,6 @@ void OPreparedStatement::putParamData (sal_Int32 index)
throw(SQLException)
}
}
// -
-//
-// getPrecision
-// Given a SQL type, return the maximum precision for the column.
-// Returns -1 if not known
-//
-
-sal_Int32 OPreparedStatement::getPrecision ( sal_Int32 sqlType)
-{
-::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-
-sal_Int32 prec = -1;
-const TTypeInfoVector rTypeInfo = m_pConnection-getTypeInfo();
-if ( !rTypeInfo.empty() )
-{
-m_pConnection-buildTypeInfo();
-}
-
-if ( !rTypeInfo.empty() )
-{
-OTypeInfo aInfo;
-aInfo.nType = (sal_Int16)sqlType;
-TTypeInfoVector::const_iterator aIter =
::std::find(rTypeInfo.begin(),rTypeInfo.end(),aInfo);
-if(aIter != rTypeInfo.end())
-prec = (*aIter).nPrecision;
-}
-return prec;
-}
//
// setStream
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx
b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 8c41355..076c9e0 100644
---
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3809a64ee66afd1be3988b1161390f9b49f1de61 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 2 10:17:12 2012 + unsigned int-sal_uInt32 Signed-off-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 7f8249c..bfc7be0 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1625,7 +1625,7 @@ static void columnMetaData2DatabaseTypeDescription( Reference XStatement domainTypeStmt = m_origin-createStatement(); columnMetaData2DatabaseTypeDescription( domainMap, rs, domainTypeStmt ); -unsigned int colNum; +sal_uInt32 colNum(0); OUString sSchema( ASCII_STR(#invalid#) ); OUString sTable( ASCII_STR(#invalid#) ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/source toolkit/inc toolkit/source
oox/source/ole/axcontrol.cxx |1
toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx |1
toolkit/inc/toolkit/controls/dialogcontrol.hxx |4 +
toolkit/inc/toolkit/controls/unocontrols.hxx | 13 +++
toolkit/source/controls/controlmodelcontainerbase.cxx | 25 ---
toolkit/source/controls/dialogcontrol.cxx | 35 --
toolkit/source/controls/unocontrols.cxx| 44 -
7 files changed, 89 insertions(+), 34 deletions(-)
New commits:
commit 8015cd2cdbdb05b0048753e12b39fa940add2021
Author: Noel Power noel.po...@novell.com
Date: Mon Feb 13 14:50:09 2012 +
handle imported picture attribute from MSO Dialog ( fdo#45995 )
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index c9bde1f..6013f75 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2495,6 +2495,7 @@ void AxUserFormModel::convertProperties( PropertyMap
rPropMap, const ControlCon
{
rPropMap.setProperty( PROP_Title, maCaption );
rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
+rConv.convertAxPicture( rPropMap, maPictureData, AX_PICPOS_CENTER );
AxContainerModelBase::convertProperties( rPropMap, rConv );
}
commit 4ea4f80121eedc7f87d950ea8e15336fb691e52f
Author: Noel Power noel.po...@novell.com
Date: Mon Feb 13 14:19:22 2012 +
fix support for embedded images for basic Dialogs ( fdo#45992 )
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 9e99968..d307c2a 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -234,7 +234,6 @@ protected:
virtual voidImplSetPosSize( ::com::sun::star::uno::Reference
::com::sun::star::awt::XControl rxCtrl );
voidImplUpdateResourceResolver();
voidImplStartListingForResourceEvents();
-::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
Impl_getGraphicFromURL_nothrow( const ::rtl::OUString _rURL );
ControlContainerBase();
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 961d449..7c9a674 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -34,6 +34,7 @@
#include com/sun/star/awt/XDialog2.hpp
#include com/sun/star/awt/XSimpleTabController.hpp
#include com/sun/star/resource/XStringResourceResolver.hpp
+#include com/sun/star/graphic/XGraphicObject.hpp
#include toolkit/helper/servicenames.hxx
#include toolkit/helper/macros.hxx
#include toolkit/controls/unocontrolcontainer.hxx
@@ -48,8 +49,11 @@
class UnoControlDialogModel : public ControlModelContainerBase
{
protected:
+::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphicObject mxGrfObj;
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16
nPropId ) const;
::cppu::IPropertyArrayHelper SAL_CALL getInfoHelper();
+// ::cppu::OPropertySetHelper
+ void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
const ::com::sun::star::uno::Any rValue ) throw
(::com::sun::star::uno::Exception);
public:
UnoControlDialogModel( const
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory
i_factory );
UnoControlDialogModel( const UnoControlDialogModel
rModel );
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx
b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 201858d..2ed2cf7 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -72,6 +72,19 @@
#define UNO_NAME_GRAPHOBJ_URLPREFIX
vnd.sun.star.GraphicObject:
#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX vnd.sun.star.Package:
+class ImageHelper
+{
+public:
+// The routine will always attempt to return a valid XGraphic for the
+// passed _rURL, additionallly xOutGraphicObject will contain the
+// associated XGraphicObject ( if url is valid for that ) and is set
+// appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid
+// object if the rURL points to a valid object
+static ::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphic
getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphicObject xOutGraphicObject, const
::rtl::OUString _rURL );
+static ::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphic getGraphicFromURL_nothrow( const
::rtl::OUString _rURL );
+
+};
+
//
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/et_EE.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ec7ed71cd3f6130268bae2ffba5a6c69ebed20b6 Author: Eike Rathke er...@redhat.com Date: Tue Feb 14 20:06:28 2012 +0100 changed [et-EE] single quotation marks to be such diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml index ce5deee..4942bfc 100644 --- a/i18npool/source/localedata/data/et_EE.xml +++ b/i18npool/source/localedata/data/et_EE.xml @@ -25,8 +25,8 @@ LongDateYearSeparator /LongDateYearSeparator /Separators Markers - QuotationStartâ/QuotationStart - QuotationEndâ/QuotationEnd + QuotationStartâ/QuotationStart + QuotationEndâ/QuotationEnd DoubleQuotationStartâ/DoubleQuotationStart DoubleQuotationEndâ/DoubleQuotationEnd /Markers ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - vcl/source
vcl/source/app/svapp.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit caa26b7c74fe89f6c33e1a9c28e527b910777b36
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 20:09:01 2012 +0200
When using libmerged there is no tk library
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 10d7f63..a0bcc15 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1544,7 +1544,13 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool
bCreateIfNotExist )
static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData-mpUnoWrapper bCreateIfNotExist !bAlreadyTriedToCreate
)
{
-::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( tk,
sal_True );
+::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
+#ifdef LIBO_MERGELIBS
+
merged,
+#else
+ tk,
+#endif
+
sal_True );
oslModule hTkLib = osl_loadModuleRelative(
thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - binfilter/bf_forms binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx |6 -
binfilter/bf_sfx2/source/doc/timestamp.cxx |4 +--
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 13
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |4 ++-
binfilter/inc/bf_tools/string.hxx | 10 +
5 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit 485398ddf96c6a7ca9e0903fa8f83f76cae43e3c
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:37:14 2012 +0100
binfilter::TimeStamp::Load: fix date/time on LP64 platform regression
diff --git a/binfilter/bf_sfx2/source/doc/timestamp.cxx
b/binfilter/bf_sfx2/source/doc/timestamp.cxx
index 90ed421..bea1920 100644
--- a/binfilter/bf_sfx2/source/doc/timestamp.cxx
+++ b/binfilter/bf_sfx2/source/doc/timestamp.cxx
@@ -223,8 +223,8 @@ BOOL TimeStamp::Load ( SvStream rStream )
impl_adjustName ( m_sModifiedByName ) ;
// Load date and time from stream.
-long nDate ;
-long nTime ;
+sal_Int32 nDate ;
+sal_Int32 nTime ;
rStream nDate nTime ;
commit 508835a5ea8d385b3a740b769d75cdd4c3362809
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:36:16 2012 +0100
binfilter::frm::OInterfaceContainer::disposing: fix boost assertion
diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 53811e1..7a65da5 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -486,13 +486,17 @@ void SAL_CALL OInterfaceContainer::disposing(const
EventObject _rSource) throw(
OInterfaceContainer::disposing: map element not normalized!
);
if ( i-second.get() == _rSource.Source.get() )
+{
// found it
+m_aMap.erase(i);
break;
+}
++i;
+
+DBG_ASSERT( i != m_aMap.end(), OInterfaceContainer::disposing:
inconsistency: the element was in m_aItems, but not in m_aMap! );
}
-m_aMap.erase(i);
m_aItems.erase(j);
}
}
commit 76647a6e03d72de7f7359e3f86ae3e9bebeffa95
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:35:27 2012 +0100
binfilter::XColorItem::GetValue: null pointer crash
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 35eaa77..341b16a 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -354,8 +354,10 @@ XubString aNameOrIndexEmptyString;
/*N*/ {
/*N*/ if (!IsIndex())
/*N*/ return aColor;
-/*N*/ else
+/*N*/ else if (pTable)
/*?*/ return pTable-Get(GetIndex())-GetColor();
+else
+return Color(); // whatever
/*N*/
/*N*/ }
commit d38915fd08569ea5c7138f1755d539cc399d4f00
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 23:32:37 2012 +0100
binfilter: fix insta-crash string constructors
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index b0d7279..81f864c 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -219,6 +219,19 @@ STRING::STRING( const STRING rStr )
mpData = rStr.mpData;
}
+STRING::STRING( const ::STRING rStr )
+{
+DBG_CTOR( STRING, DBGCHECKSTRING );
+DBG_CHKOBJ( rStr, STRING, DBGCHECKSTRING );
+
+// this is good enough for binfilter...
+STRING temp;
+temp.Assign(rStr);
+
+STRING_ACQUIRE((STRING_TYPE *)temp.mpData);
+mpData = temp.mpData;
+}
+
// ---
STRING::STRING( const STRING rStr, xub_StrLen nPos, xub_StrLen nLen )
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 0b4c00e..3eab25a 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -141,10 +141,7 @@ private:
public:
ByteString();
ByteString( const ByteString rStr );
-ByteString( const ::ByteString rStr )
-{
-Assign(rStr);
-}
+ByteString( const ::ByteString rStr );
ByteString( const ByteString rStr, xub_StrLen nPos,
xub_StrLen nLen );
ByteString( const rtl::OString rStr );
ByteString( const sal_Char* pCharStr );
@@ -376,10 +373,7 @@ private:
public:
UniString();
UniString( const UniString rStr );
-UniString( const ::UniString rStr )
-{
-Assign(rStr);
-
Re: New tool for better understanding the codebase, to complement the wiki.
On 02/03/2012 03:56 AM, Josh Heidenreich wrote: It uses cgit to download the README or readme.txt files in all of the top-level directories, and it generates some HTML files for easy viewing. The first paragraph (everything before an empty line) is considered the short description, and is shown on the list page. Clicking on a module shows the full description, as well as a link to the tree in cgit. What is the markup format to be used in the READMEs? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
R: minor autogen.sh (windows /cygwin) bug [SOLVED (?)]
Yesterday, after a system reboot and a new clone, the build was completed without errors using jobs=1 cpus=1 On Thu, 2012-02-09 at 17:18 +0100, walter wrote: Using --with-max-jobs=1 --with-num-cpus=1 fails generating vfork error. Nasty :-) did you get past that ? vfork errors sound quite unpleasant. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
AOOo Issues [From Symphony]
Hi all, Hi Markus, in AOOo Bugzilla I find lots of bugs with [From Symphony] in Subject line, I just took https://issues.apache.org/ooo/show_bug.cgi?id=118880 to https://bugs.freedesktop.org/show_bug.cgi?id=46017 That's a fruitfully source, we should check that systematically. I recommend proceeding as following: Check AOOo for [From Symphony] Leave a comment in AOOo bug concerning your result: LibO also affected LibO not affected If you use exactly those strings we can avoid double work easily with a clever query, oyu find it on my Workbench https://wiki.documentfoundation.org/User:RBd/Workbench#AOOo_Issues_From_Symphony If you suggest a different proceeding please hurry up and post it here. Please feel encouraged to check AOoo Bugs systematically. May be you have ideas to improve the query to include more AOOo iissue with big probability that LibO also is affected? Further discussion please in libreoffice...@freedesktop.org Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 02/13/2012 11:21 PM, Matúš Kukan wrote: On 12 February 2012 23:51, Matúš Kukanmatus.ku...@gmail.com wrote: Do not push them without improvement, make check fails for me. Attached diff solves one problem but still there is something wrong. Well, I was fooled by smoketest/com/sun/star/comp/smoketest/makefile.mk There is javamaker involved, but the produced .class file does not end up in TestExtension.jar So the call to javamaker it's pointless ..whatever. Then I also tried to remove TestExtension.rdb from TestExtension.oxt and make check was also successful. So, can I remove TestExtension.idl file ? Anybody has opinion about this ? The TestExtension.rdb type library and the TestExtension.idl new-style service definition should indeed be unnecessary. The only use of the corresponding service is via BASIC createUnoService. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
On 13-02-12, Rene Engelhard r...@debian.org wrote: Hi, first of all: thanks for this effort, which should have been done when this lucene dependency was introduced in the first place in OOo times. But... On Mon, Feb 13, 2012 at 04:17:49PM +0100, Radek Doulik wrote: * This implementation is using the master branch of CLucene's git, with clucene-contribs-lib enabled (for CJK support). The released version of CLucene is compatible with Lucene 1.9.x, whereas LibreOffice uses Lucene 2.3. This is bad. Will that get somewhen released? And is the clucene-contribs-lib included? (And if separate, how hard is to enable it? Patching it into proper clucene is a no-go.) As Radek says, we should (if it was only me: must) support building against standard libclucene. And relying on a git snapshot is bad... I can't guess at if or when there will be a clucene release. However the released version is ancient, and the developers themselves say the git version is stable and should be used. On the other hand, I don't think distributions carry it. I could look into using the released 1.9.x-compatible version instead, but I expect there was a reason for using Lucene 2.3.x. There is a tag for clucene-src-2.3.3.4 for which there are also tarballs on the sourceforge page. We could depend on that version -- it is a small dependency and takes under a minute to build. Regarding the contribs: it is part of their git repository, and can be enabled as part of the standard build. * Can someone help to figure out how to make CLucene part of the LO build process? CLucene is using CMake and there seems to be no way to 'make install' the clucene-contribs-lib, so this might be tricky. This usually done like this, you either use system libraries if available or build the package (CLucene in this case) inside LO build tree. Look into configure.in, search for cairo for example. Cairo is graphic library where we link against system one or build one inside LO. Giving Cc to _rene_ and pmladek who know a lot about build process. Exactly. But he didn't post *any* makefile, so trying to write a configure check is moot right now anyways ;-) I'm planning to work on that later today. (But also see the post by Caolan, which you may have missed.) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: AOOo Issues [From Symphony]
Hi Rainer, you wrote: That's a fruitfully source, we should check that systematically. absolutely - just did for the presentation bugs, those which I could test (one had a non-public bug document) are fixed for LibO. Leave a comment in AOOo bug concerning your result: LibO also affected LibO not affected If you use exactly those strings we can avoid double work easily with a clever query, oyu find it on my Workbench Hmm - any other way here, without having to pollute a foreign bugtracker with LibO-specifics? A static list in the wiki maybe? May be you have ideas to improve the query to include more AOOo iissue with big probability that LibO also is affected? Hard to tell - also, my hunch would be (given the limited sample from above), that many of those obvious bugs are fixed here? ;) Cheers, -- Thorsten pgpHTet6ZpjQ3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
Thanks for the answers, responses below. On 13-02-12, Caolán McNamara caol...@redhat.com wrote: The xmlhelp/source/com/sun/star/help/*.java route is the one that sets the bExtensionMode. I think this one is which third party extensions can insert their help into our help system. The cxxhelp is the straightforward backend of the search in help dialogs. Yes, I found that java code (the HelpIndexer I refer to). I'll work on a patch to replace the XInvocations of the Java code with calls to my code. couldn't the ZIP creation just always be replaced by this alternative code path? hmph, indeed, seems that way on the face of it. Lets try that. Great! I'll work on that too. * This implementation is using the master branch of CLucene's git, with clucene-contribs-lib enabled (for CJK support). The released version of CLucene is compatible with Lucene 1.9.x, whereas LibreOffice uses Lucene 2.3. I don't *think* compatibility between java and c++ file formats matters to us, if that's what you're getting at here. Ok, that's good to know. I'm not sure if the 1.9.x-compatible version has all the required functionality (but I just sent another message to the list about this). * I'm not sure exactly how to make my code build as part of the LO build, but could probably figure it out as long as the previous point is addressed. Presumably just editing l10ntools/source/help/makefile.mk and adding another target or so in there will do the trick. I can hook this up and see if how it goes. Great, send me a patch if you get it going, then I can work on some of the other stuff. * CLucene (like Java) uses wide characters throughout, and defines it's own TCHAR type for that. Can we make this play nice with how LO handles strings? * I'm using some Unix headers, are these available on windows or should I use some kind of LO equivalent of them? Should be basically cross-platform stuff in sal/inc/ to handle any of that stuff. Ok, will check it out, thanks. * I tried replacing the HelpIndexerTool in helpcontent2/util/target.pmk, which seems to work fine, except that I'm returning an error code when the content/caption directory doesn't exist (unlike HelpIndexerTool), which breaks on shared. I'll see if I can hook up what you got to our build system, ignoring the lack of clucene in our tree and assuming availablility of system clucene, and see how that goes. I've got an update on this: I managed to create all the indexes and doing a few searches on both the Java-generated an the C++-generated indexes seems to give identical results (at least if I pipe the results through sort). Gert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] [PATCH] fdo#37775 - EasyHack: Recent Documents not updated by Save Save As...
On Sun, Feb 12, 2012 at 3:38 PM, Cor Nouws oo...@nouenoff.nl wrote: Korrawit Pruegsanusak wrote (12-02-12 13:30) IMHO the case which 'file open' would be useful is already described in the bug comment 0 and 4: saving with a new name doesn't get old name into the list. Yes, if that is the technical reason, and can't be (easily) solved different (as suggested below) I do not object to have it in! It's possible to solve that without having to update the list on open. We can intercept the beginning of the Save As operation and update the list with the old document. I uploaded a new patch that does that (and removed the list update on document open). Patch: https://bugs.freedesktop.org/attachment.cgi?id=57016 Patch review: https://bugs.freedesktop.org/page.cgi?id=splinter.htmlbug=37775attachment=57016 Regards, --Muhammad ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: AOOo Issues [From Symphony]
Hi Thorsten, Rainer, On Tue, 2012-02-14 at 09:39 +0100, Thorsten Behrens wrote: Leave a comment in AOOo bug concerning your result: LibO also affected LibO not affected If you use exactly those strings we can avoid double work easily with a clever query, oyu find it on my Workbench Hmm - any other way here, without having to pollute a foreign bugtracker with LibO-specifics? A static list in the wiki maybe? Well, we can combine the use of a static list in a wiki page and the greasemonkey script I wrote in the IZ times (note that I haven't tested/updated that script with the move to AOOo bugzilla). It's only a small JS hack away and that script already gets some data from this page: http://wiki.documentfoundation.org/QA/FixedIZ Hope that helps, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] [PATCH]bug 44516 improved label and business card document creation
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Em 14-02-2012 04:44, Winfried Donkers escreveu: Can this patch be pushed to 3.4 and 3.5 branches as well? The patch addresses problem that go way back in time (pre-LibreOffice at least). Winfried Just a question... The new schema with the paper size will work with older versions of LibreOffice and OpenOffice? In other words, if I replace Labels.xcu from older OOo, with the new one, is it going to break the label feature or not of OOo? I ask that because I have a Label.xcu in an extension, and if I modify it for tre new schema, I need to know in order to update the version. Thank you - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPOiapAAoJEJp3R7nH3vLx8KUH/2G7yDfxq+DqAItNDoRVYEJm e3AnoYMRVH5Hd+spG0kshUHcNsCdSwbJRAfcGaSb7whLCuGkPDlNufjIMuPrNx+h 48qVt1FEOEjEFyU2zXNMZrhvLPJWFcc7/Lx0fo4HYae6F900BH1Q5GqisLf4pJbw EvDnBP+gOWNlAinZoDrMj7znmNxJV2DTQCNEY40NUaKQKQhpO8eMVbVqCc+wfmLc yv8W0Oxzi94T9rvCmTYf8wHAKodeHBC0Zs+vxM6oAglnHTr3IEsnfxnPePYhh0ge 0arSdi+sHvTjTAZVYmterCxhGHgkberkOYEu9CXYupVNfZqIDr7UTnUy40mVG9A= =naA1 -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] Adapt SDK to changed paths in LO installation
Please review and cherry-pick to libreoffice-3-5 the commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1 Resolves rhbz#789622: Adapt SDK to changed paths in LO installation. Without it, SDK fails to build even simple examples, cf. https://bugzilla.redhat.com/show_bug.cgi?id=789622#c2 Trying to build libreoffice-voikko results in an error: 'cppumaker : init registries failed, check your registry files.' Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [REVIEW] [PATCH]bug 44516 improved label and business card document creation
Olivier Hallot wrote (14 februari 2012) The new schema with the paper size will work with older versions of LibreOffice and OpenOffice? In other words, if I replace Labels.xcu from older OOo, with the new one, is it going to break the label feature or not of OOo? It will work with 'old style' custom label definitions (in registrymodifications.xcu) and update this to 'new style' definition when used. If you put the new Labels.xcu (and not the associated C++-code changes) in an older OOo, it should work, as the older OOo (or LibO) reads a fixed numer of values from Labels.xcu. So, it will not read the page dimensions, even if they are there. I have tested with 'old style' custom label definitions (in registrymodifications.xcu) and the patch; that woks fine. I have not tested the new Labels.xcu with old OOo or old LibO; IMHO you'll need to compile and build first. I ask that because I have a Label.xcu in an extension, and if I modify it for tre new schema, I need to know in order to update the version. I have not tested with extensions. Are the label definitions read in the extension? If so, I presume you use the class SwLabItem to fill with the label definition. The patched SwLabItem has been expanded with page dimensions. (Possibly I don't understand what you mean exactly) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW] fix RTF import of text frames with exact height
Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=e0328096dc21ce12d15db2045074e7860872570f Could someone review and cherry-pick to -3-5, please? Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Patch for Easy Hack 45033
Hi Italo, On Mon, Feb 13, 2012 at 12:27:26PM +0100, Italo Vignoli it...@italovignoli.com wrote: I have patched the biblio.odb document with LibreOffice entries (got rid of the old OOo entries). The patch is below to be checked, but I do not understand if I have to attach the patched document as well. Please help. Thanks, Italo --- extras/source/database/biblio.odb | Bin 2796 - 2723 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/extras/source/database/biblio.odb b/extras/source/database/biblio.odb Just for the reference, the problem here is that the last two line would have to be in a single line (whitespace mangled). The best way to avoid this is to just attach the file produced by git format-patch -1 to the email. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5][REVIEW-3-4] fdo#45995 fdo#45992
Some cherry picking appreciated handle imported picture attribute from MSO Dialog ( fdo#45995 ) needed for 3.5 ( and possibly 3.4... I need to check that ) core:58255c47b1d540fd2493b4ed132aa7fa82da156e fix support for embedded images for basic Dialogs ( fdo#45992 ) needed for 3.5 ( and definitely 3.5, didn't notice that ImageURL property wasn't processed for UserForms in oox import when I removed msocximex ) core:468c588875b4858711b708bbc66e0740263bb1f3 Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OK to get rid of scaddins?
Hi Michael, On Mon, 2012-02-13 at 16:06 +0100, Michael Stahl wrote: (of course i don't care if you do it for a special merged libs mode, but C++ development is already a sufficiently unproductive activity that we shouldn't make it even more so...) Is it necessary to build with full debug enabled ? how slow is it really ? [ if it takes ten minutes - how slow is it to re-build with just the bits you want symbols for re-run whatever you're debugging ?]. i find it works quite well with 8GB of RAM, except that linking takes much longer (and you better not have 3 unit tests crash concurrently otherwise gdb will lock up the box for 15 minutes until OOM killer is invoked...). So - can you give some concrete ideas of time space it is taking to link our shared libraries ? and also the growth in size that we get - what is the stripped vs. non-stripped output ? Mark prolly has some great insights as to how to improve that. I wonder if the new 'gold' linker will help performance wise - have you tried it ? no, but the problem is really the space that the object files take up: they don't fit all into RAM cache, and ld is blocked on I/O most of the time (in tail_build). If we have 8Gb of debug symbols per module there is a -real- problem here; Lubos was talking of using some more magic / smaller debug option in the past: -gdwarf-4 Are you using that ? I believe we turned it off by default again for some reason or other: potentially we want to add a check for a tolerably recent toolchain and debugger on the system before defaulting to that [ it supposedly saved 30% of the size ], but you need gdb 7.3 really. Either way, it sucks to hinder ourselves from creating a more efficient library structure because of un-necessary performance problems in the toolchain ;-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-5][REVIEW-3-4] fdo#45995 fdo#45992
On 14/02/12 10:39, Noel Power wrote: handle imported picture attribute from MSO Dialog ( fdo#45995 ) needed for 3.5 ( and possibly 3.4... I need to check that ) core:58255c47b1d540fd2493b4ed132aa7fa82da156e I sorta got mixed up with my comments about these bugs, this one is indeed ( and I always expected it ) valid for 3.4 ( this is the one to do with the ImageURL property in oox ) fix support for embedded images for basic Dialogs ( fdo#45992 ) needed for 3.5 ( and definitely 3.5, didn't notice that ImageURL property wasn't processed for UserForms in oox import when I removed msocximex ) this is the one I thought may be needed for 3.4 but it turns out that the merge badness happened later than I thought and this is not an issue in the 3.4 branch sorry for the confusion Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEWED:3-5,3-4] fdo#43399 address data source wizard non-functional if no evolution
Hi Lionel, Gosh VCL's button grouping is an unmitigated horror :-) On Mon, 2012-02-13 at 18:19 +0100, Lionel Elie Mamane wrote: Attached patch fixes that by including the hidden items in the same selection group, too. Pushed to libreoffice-3-5 and libreoffice-3-4. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Grammar checker development for LibreOffice
Hi Cor, Thanks for your feedback. Last year I was involved in Dutch language developments (I worked with the Dutch OpenTaal Foundation to improve Dutch spell checking, sponsored by the Dutch Language Union and the foundation), but I have known the active and excellent open source Dutch language developments much longer. I strongly think, the default grammar checking of LibreOffice have to prefer the minimalistic, non-intrusive sentence checking/proofreading. With the Lightproof editor extension, it is not so complicated to develop these basic Dutch/etc. sentence checking rules, based on the English ones. To give the best for other (extra/optional) requirements (writing aids for beginners and uncomplaining users) is to integrate the rule based Dutch grammar checking of LanguageTool (developed by Ruud Baars) with future statistical based Dutch developments of After the Deadline grammar checker, and adding an option (ie. an After the Deadline client) to the suggested Lightproof based Dutch grammar checker of LibreOffice to use it. This optional/extra server based grammar checking would be the ideal solution, because the statistical methods could be quite resource intensive, see 1 GB minimal memory requirement of contextual (only English) spell checking of MS Office 2010. Best regards, László 2012/2/13 Cor Nouws oo...@nouenoff.nl: Hi Németh, Németh László wrote (13-02-12 16:20) Lightproof (from “lightweight proofreader”) is a Python grammar checker framework for LibreOffice. Default English, Hungarian and [...] Thanks for the info and the checker! We had some people before in Netherlands community active with spell checking and such. See if they are interested. Would be great if some work on Dutch grammar checking could be done. Cheers, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Tinderbox failure, last success: 2011-12-05 09:00:13
Kohei Yoshida píše v Po 13. 02. 2012 v 08:53 -0500: Can we please do something about Fridrich's tinderbox? Its last successful build is over 2 months ago... This tinderbox is singlehandedly increasing the signal-to-noise ratio. I have stopped them yesterday morning. I will enable them once a build succeeds there. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sal / gcc conditionals ...
On 02/13/2012 06:45 PM, Michael Meeks wrote: * cppu/inc/cppu/macros.hxx: CPPU_GCC3_ALIGN - uh ? I assume this should be just CPPU_GCC_ALIGN and with only one definition in today's world ? We still need two versions of the define, one for __GNUC__ and one for others. The name can remain CPPU_GCC3_ALIGN IMO---after all, the ABI for that UNO binding is still known as GCC3 in UNO land. * sal/inc/rtl/instance.hxx: #if (__GNUC__= 4) Do we need all those conditionals ? or do we want a #if defined (__GCC__) there ? Ah no, these should actually be conditional on HAVE_THREADSAFE_STATICS; fixed now as http://cgit.freedesktop.org/libreoffice/core/commit/?id=3073b539d28a4ea29347e8060e19dda080c5d13b. * sal/inc/sal/config.h We have a conditional for SAL_ISO_CONST, but do we ever even use that thing ? :-) if not, can we just drop it ? breaks source compat, but ... if we didn't use it ;-) Yup, guess that can go completely for good. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Help - minor updates
Hi Stanislav, thanks for your patches! One thing I noticed, is it possible to replace StarOffice with LibreOffice instead of OpenOffice in patch #3? Cheers Radek On Sun, 2012-02-12 at 20:14 +0100, Stanislav Horáček wrote: Hello, I noticed several parts where current help didn't correspond with the latest UI (3.5.0). Some small patches are attached. Greetings, Stan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
On Tue, 2012-02-14 at 09:45 +0100, G.H.M.Valkenhoef, van wrote:
Yes, I found that java code (the HelpIndexer I refer to). I'll work on
a patch to replace the XInvocations of the Java code with calls to my
code.
I can try and knock together a skeleton of a conversion of that Java
component to a C++ component for you to integration the clucene stuff
into.
Presumably just editing l10ntools/source/help/makefile.mk and adding
another target or so in there will do the trick. I can hook this up
and see if how it goes.
Great, send me a patch if you get it going, then I can work on some of
the other stuff.
Attached is your code back again but added into the l10ntools
makefile.mk and other build-foo. And a patch to helpcontent2 (different
repository) to use it to build the helpcontent and just use normal zip
to zip them up.
I hacked the helplinker to let the shared ones through without error
and cut out the cjk.analyzer for now as I don't happen to have that
compiled up here.
I've got an update on this: I managed to create all the indexes and
doing a few searches on both the Java-generated an the C++-generated
indexes seems to give identical results (at least if I pipe the
results through sort).
sounds great, as does the other news that building clucene only takes a
short time.
C.
From 83dc0151cde6b765f4235456ae1e58813d3746bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
Date: Tue, 14 Feb 2012 11:53:27 +
Subject: [PATCH] add clucene helpindexer program
---
l10ntools/prj/build.lst |2 +-
l10ntools/prj/d.lst |6 +-
l10ntools/source/help/helpindexer.cxx | 247 +
l10ntools/source/help/makefile.mk | 30 ++---
4 files changed, 263 insertions(+), 22 deletions(-)
create mode 100644 l10ntools/source/help/helpindexer.cxx
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
index 3cce7a3..c714256 100644
--- a/l10ntools/prj/build.lst
+++ b/l10ntools/prj/build.lst
@@ -1,4 +1,4 @@
-tr l10ntools : tools LIBXSLT:libxslt BERKELEYDB:berkeleydb LUCENE:lucene NULL
+tr l10ntools : tools LIBXSLT:libxslt BERKELEYDB:berkeleydb NULL
tr l10ntools usr1 - all tr_mkout NULL
tr l10ntools\inc nmake - all tr_inc NULL
tr l10ntools\source nmake - all tr_src tr_inc NULL
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index eded848..174bb6c 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -26,12 +26,14 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
..\%__SRC%\bin\txtconv %_DEST%\bin\txtconv
..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv
..\%__SRC%\class\FCFGMerge.jar %_DEST%\bin\FCFGMerge.jar
-..\%__SRC%\class\HelpIndexerTool.jar %_DEST%\bin\HelpIndexerTool.jar
-..\%__SRC%\bin\HelpLinker %_DEST%\bin\HelpLinker
..\%__SRC%\bin\HelpCompiler %_DEST%\bin\HelpCompiler
..\%__SRC%\bin\HelpCompiler.exe %_DEST%\bin\HelpCompiler.exe
+..\%__SRC%\bin\HelpLinker %_DEST%\bin\HelpLinker
..\%__SRC%\bin\HelpLinker.exe %_DEST%\bin\HelpLinker.exe
..\%__SRC%\bin\HelpLinker* %_DEST%\bin
+..\%__SRC%\bin\HelpIndexer %_DEST%\bin\HelpIndexer
+..\%__SRC%\bin\HelpIndexer.exe %_DEST%\bin\HelpIndexer.exe
+..\%__SRC%\bin\HelpIndexer* %_DEST%\bin
..\scripts\localize %_DEST%\bin\localize
..\scripts\fast_merge.pl %_DEST%\bin\fast_merge.pl
diff --git a/l10ntools/source/help/helpindexer.cxx b/l10ntools/source/help/helpindexer.cxx
new file mode 100644
index 000..c327119
--- /dev/null
+++ b/l10ntools/source/help/helpindexer.cxx
@@ -0,0 +1,247 @@
+#include CLucene/StdHeader.h
+#include CLucene.h
+#ifdef TODO
+#include CLucene/analysis/LanguageBasedAnalyzer.h
+#endif
+
+#include unistd.h
+#include sys/stat.h
+#include dirent.h
+#include errno.h
+#include string.h
+
+#include string
+#include iostream
+#include algorithm
+#include set
+
+// I assume that TCHAR is defined as wchar_t throughout
+
+using namespace lucene::document;
+
+class HelpIndexer {
+ private:
+ std::string d_lang;
+ std::string d_module;
+ std::string d_captionDir;
+ std::string d_contentDir;
+ std::string d_indexDir;
+ std::string d_error;
+ std::setstd::string d_files;
+
+ public:
+
+ /**
+ * @param lang Help files language.
+ * @param module The module of the helpfiles.
+ * @param captionDir The directory to scan for caption files.
+ * @param contentDir The directory to scan for content files.
+ * @param indexDir The directory to write the index to.
+ */
+ HelpIndexer(std::string const lang, std::string const module,
+ std::string const captionDir, std::string const contentDir,
+ std::string const indexDir);
+
+ /**
+ * Run the indexer.
+ * @return true if index successfully generated.
+ */
+ bool indexDocuments();
+
+ /**
+ * Get the error string (empty if no error occurred).
+ */
+ std::string const getErrorMessage();
+
+ private:
+
+ /**
+ * Scan the caption contents directories for help files.
+ */
+ bool scanForFiles();
+
+ /**
+ * Scan for files in the given directory.
+ */
+ bool
linking performance (was: Re: OK to get rid of scaddins?)
On 14/02/12 11:52, Michael Meeks wrote: Hi Michael, On Mon, 2012-02-13 at 16:06 +0100, Michael Stahl wrote: (of course i don't care if you do it for a special merged libs mode, but C++ development is already a sufficiently unproductive activity that we shouldn't make it even more so...) Is it necessary to build with full debug enabled ? how slow is it really ? [ if it takes ten minutes - how slow is it to re-build with just the bits you want symbols for re-run whatever you're debugging ?]. i find it works quite well with 8GB of RAM, except that linking takes much longer (and you better not have 3 unit tests crash concurrently otherwise gdb will lock up the box for 15 minutes until OOM killer is invoked...). So - can you give some concrete ideas of time space it is taking to link our shared libraries ? and also the growth in size that we get - what is the stripped vs. non-stripped output ? Mark prolly has some great insights as to how to improve that. so the objects from gbuild modules with debug are about 6.5G: du -sh workdir/unxlngx6/*Object 1,1M workdir/unxlngx6/CObject 6,3G workdir/unxlngx6/CxxObject 960K workdir/unxlngx6/GenCObject 164M workdir/unxlngx6/GenCxxObject the libraries and executables linked from these, 2.9G: du -sh workdir/unxlngx6/LinkTarget/ 2,9G workdir/unxlngx6/LinkTarget/ i don't have a non-dbgutil tree to compare to. I wonder if the new 'gold' linker will help performance wise - have you tried it ? no, but the problem is really the space that the object files take up: they don't fit all into RAM cache, and ld is blocked on I/O most of the time (in tail_build). If we have 8Gb of debug symbols per module there is a -real- problem here; the problem is more likely that in tail_build we first compile all the object files, and only after they have all been built they are linked into libraries/executables. that probably results in sub-optimal use of disk cache :) perhaps i'll look into fixing that in gbuild when i have some time, but LinkTarget is annoyingly complex so that would need some testing... Lubos was talking of using some more magic / smaller debug option in the past: -gdwarf-4 Are you using that ? I believe we turned it off by default again for some reason or other: potentially we want to add a check for a tolerably recent toolchain and debugger on the system before defaulting to that [ it supposedly saved 30% of the size ], but you need gdb 7.3 really. no, AFAIR Lubos enabled that on master and there were some problems with it (gdb was horribly slow or something), so he disabled it again a week later. Either way, it sucks to hinder ourselves from creating a more efficient library structure because of un-necessary performance problems in the toolchain ;-) well perhaps there are really 2 different target audiences, product builds need fast start-up, while development builds need fast re-build cycles... All the best, Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Help - minor updates
On 14/02/12 12:51, Radek Doulik wrote: Hi Stanislav, thanks for your patches! One thing I noticed, is it possible to replace StarOffice with LibreOffice instead of OpenOffice in patch #3? uhmm, those are compatibility options for ancient versions of SO/OOo, unless you have plans to release a LO re-branded OpenOffice.org 1.1 i'd say LibreOffice would be _wrong_ here. (perhaps it really should be StarOffice 6/7 or OpenOffice.org 1.1 to enumerate all the affected releases, but i have no strong opinion on that and perhaps it's just too long...) Cheers Radek On Sun, 2012-02-12 at 20:14 +0100, Stanislav Horáček wrote: Hello, I noticed several parts where current help didn't correspond with the latest UI (3.5.0). Some small patches are attached. Greetings, Stan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: linking performance (was: Re: OK to get rid of scaddins?)
Hi Michael, On Tue, 2012-02-14 at 13:07 +0100, Michael Stahl wrote: the problem is more likely that in tail_build we first compile all the object files, and only after they have all been built they are linked into libraries/executables. Perhaps; could it also be that we like to compile with gcc in some eight way parallel way, but when it comes to linking, we -really- don't want to bog our machine down in that way ? I wonder if we could explicitly limit parallelism of linking in some way (?) - we should prolly also do this for the java compilation which is often quite memory intensive and doesn't do well with umpteen in parallel (at least on my machine). that probably results in sub-optimal use of disk cache :) Riight; but the parallelism creating a problem with a working set that is avoidably larger than memory footprint sounds like a more likely culprit (perhaps) ? Either way, it sucks to hinder ourselves from creating a more efficient library structure because of un-necessary performance problems in the toolchain ;-) well perhaps there are really 2 different target audiences, product builds need fast start-up, while development builds need fast re-build cycles... Completely :-) trading one vs. the other sucks - hence the merged libs option, that we can use for product builds, and the non-merged version that we can use all these little, bitty libraries for (I guess). At least, until we have working incremental linking - it's always encouraging to see things like: http://gcc.gnu.org/wiki/GoldIncrementalLinking but - I wonder how the mozilla guys cope with this problem. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: linking performance (was: Re: OK to get rid of scaddins?)
Hi, Added Tom to the CC, see thread here: http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/24055/focus=24096 (Although it seems posts from non-subscribers, aka me, are not allowed, so you won't see my earlier reply there. I'll send it to you separately.) On Tue, Feb 14, 2012 at 01:07:20PM +0100, Michael Stahl wrote: On 14/02/12 11:52, Michael Meeks wrote: On Mon, 2012-02-13 at 16:06 +0100, Michael Stahl wrote: (of course i don't care if you do it for a special merged libs mode, but C++ development is already a sufficiently unproductive activity that we shouldn't make it even more so...) Is it necessary to build with full debug enabled ? how slow is it really ? [ if it takes ten minutes - how slow is it to re-build with just the bits you want symbols for re-run whatever you're debugging ?]. i find it works quite well with 8GB of RAM, except that linking takes much longer (and you better not have 3 unit tests crash concurrently otherwise gdb will lock up the box for 15 minutes until OOM killer is invoked...). So - can you give some concrete ideas of time space it is taking to link our shared libraries ? and also the growth in size that we get - what is the stripped vs. non-stripped output ? Mark prolly has some great insights as to how to improve that. so the objects from gbuild modules with debug are about 6.5G: du -sh workdir/unxlngx6/*Object 1,1Mworkdir/unxlngx6/CObject 6,3Gworkdir/unxlngx6/CxxObject 960Kworkdir/unxlngx6/GenCObject 164Mworkdir/unxlngx6/GenCxxObject the libraries and executables linked from these, 2.9G: du -sh workdir/unxlngx6/LinkTarget/ 2,9Gworkdir/unxlngx6/LinkTarget/ i don't have a non-dbgutil tree to compare to. I wonder if the new 'gold' linker will help performance wise - have you tried it ? no, but the problem is really the space that the object files take up: they don't fit all into RAM cache, and ld is blocked on I/O most of the time (in tail_build). If we have 8Gb of debug symbols per module there is a -real- problem here; the problem is more likely that in tail_build we first compile all the object files, and only after they have all been built they are linked into libraries/executables. that probably results in sub-optimal use of disk cache :) perhaps i'll look into fixing that in gbuild when i have some time, but LinkTarget is annoyingly complex so that would need some testing... Lubos was talking of using some more magic / smaller debug option in the past: -gdwarf-4 Are you using that ? I believe we turned it off by default again for some reason or other: potentially we want to add a check for a tolerably recent toolchain and debugger on the system before defaulting to that [ it supposedly saved 30% of the size ], but you need gdb 7.3 really. no, AFAIR Lubos enabled that on master and there were some problems with it (gdb was horribly slow or something), so he disabled it again a week later. That really needs some investigation (which is why I added Tom to the CC) recent GDB versions improved startup performance a lot, so if enabling DWARF4 would make GDB startup slower again (which surprises me) that would be really bad. Especially since DWARF4 is now the default at least on Fedora. Could you give some more specifics about what was tried, what the original startup times for gdb were and how much change you saw? Either way, it sucks to hinder ourselves from creating a more efficient library structure because of un-necessary performance problems in the toolchain ;-) well perhaps there are really 2 different target audiences, product builds need fast start-up, while development builds need fast re-build cycles... Thanks, Mark ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
Thorsten, Stephan, List, nope, it's a manual process that I run every once in a while. Doxygen itself is rather heaviweight, so you really don't want to run that on a server, let alone for every commit. Can it be run standalone, without the rest of doxygen? Could it be run every commit in that case until the READMEs stablalise a bit (i.e. I get something in there for every module as a starting point for this project) Just, if possible, use a local git repo directly, and avoid cgit. It's causing fdo much less load. Will do. Perhaps I will discuss with you further my plans for the second version (running off a database to allow for searching) at some point down the line. What is the markup format to be used in the READMEs? It's a loose copy of the wikimedia syntax used in the wiki, so: - Paragraphs are separated by a blank line. - Headings are in the form == heading == (without the quotes) - Links to modules are [[module]]. - External links are [link] - Links to cgit are [git:path/to/file] Cheers, Josh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
On 02/14/2012 01:37 PM, Josh Heidenreich wrote: What is the markup format to be used in the READMEs? It's a loose copy of the wikimedia syntax used in the wiki, so: - Paragraphs are separated by a blank line. - Headings are in the form == heading == (without the quotes) - Links to modules are [[module]]. - External links are [link] - Links to cgit are [git:path/to/file] So no way to have a (license) comment at the head of a README? (Somewhat unfortunate for http://cgit.freedesktop.org/libreoffice/core/commit/?id=00717e8550ac41069a01c7ef7c11fbe40d75e91d, where I moved the contents of a file originally containing a license header. Whatever.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] convert svxrtf.hxx in editeng module from table.hxx to std::map
Hi
License statement already on file.
make check succeeds.
Note that I tried converting these usages to boost::ptr_map, but I ran
into entirely undecipherable C++ template errors.
(can't wait for template-type-checking aka. concepts to make it into
the language).
Regards, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index c79f2bd..691725f 100644
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -29,7 +29,6 @@
#ifndef _SVXRTF_HXX
#define _SVXRTF_HXX
-#include tools/table.hxx
#include tools/string.hxx
#include svl/itemset.hxx
#include svtools/parrtf.hxx
@@ -39,6 +38,8 @@
#include deque
#include utility
#include vector
+#include map
+
class Font;
class Color;
class Graphic;
@@ -85,8 +86,8 @@ public:
typedef Color* ColorPtr;
typedef std::deque ColorPtr SvxRTFColorTbl;
-DECLARE_TABLE( SvxRTFFontTbl, Font* )
-DECLARE_TABLE( SvxRTFStyleTbl, SvxRTFStyleType* )
+typedef std::mapshort, Font* SvxRTFFontTbl;
+typedef std::mapsal_uInt16, SvxRTFStyleType* SvxRTFStyleTbl;
typedef SvxRTFItemStackType* SvxRTFItemStackTypePtr;
SV_DECL_PTRARR_DEL( SvxRTFItemStackList, SvxRTFItemStackTypePtr, 1 )
diff --git a/editeng/source/editeng/eertfpar.cxx
b/editeng/source/editeng/eertfpar.cxx
index d508716..4e7254f 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -371,10 +371,11 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType
rSet )
if ( rSet.StyleNo() pImpEditEngine-GetStyleSheetPool()
pImpEditEngine-GetStatus().DoImportRTFStyleSheets() )
{
-SvxRTFStyleType* pS = GetStyleTbl().Get( rSet.StyleNo() );
-DBG_ASSERT( pS, Template not defined in RTF! );
-if ( pS )
+SvxRTFStyleTbl::iterator it = GetStyleTbl().find( rSet.StyleNo() );
+DBG_ASSERT( it != GetStyleTbl().end(), Template not defined in RTF!
);
+if ( it != GetStyleTbl().end() )
{
+SvxRTFStyleType* pS = it-second;
pImpEditEngine-SetStyleSheet( EditSelection( aStartPaM, aEndPaM
), (SfxStyleSheet*)pImpEditEngine-GetStyleSheetPool()-Find( pS-sName,
SFX_STYLE_FAMILY_ALL ) );
nOutlLevel = pS-nOutlineNo;
}
@@ -433,11 +434,17 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType
rSet )
SvxRTFStyleType* EditRTFParser::FindStyleSheet( const XubString rName )
{
-SvxRTFStyleType* pS = GetStyleTbl().First();
-while ( pS ( pS-sName != rName ) )
-pS = GetStyleTbl().Next();
+SvxRTFStyleTbl aTable = GetStyleTbl();
+SvxRTFStyleTbl::iterator it = aTable.begin();
+while ( it != aTable.end() )
+{
+SvxRTFStyleType* pS = it-second;
+if ( pS-sName == rName )
+return pS;
+++it;
+}
-return pS;
+return NULL;
}
SfxStyleSheet* EditRTFParser::CreateStyleSheet( SvxRTFStyleType* pRTFStyle )
@@ -451,9 +458,13 @@ SfxStyleSheet* EditRTFParser::CreateStyleSheet(
SvxRTFStyleType* pRTFStyle )
String aParent;
if ( pRTFStyle-nBasedOn )
{
-SvxRTFStyleType* pS = GetStyleTbl().Get( pRTFStyle-nBasedOn );
-if ( pS ( pS !=pRTFStyle ) )
-aParent = pS-sName;
+SvxRTFStyleTbl::iterator it = GetStyleTbl().find( pRTFStyle-nBasedOn
);
+if ( it != GetStyleTbl().end())
+{
+SvxRTFStyleType* pS = it-second;
+if ( pS ( pS !=pRTFStyle ) )
+aParent = pS-sName;
+}
}
pStyle = (SfxStyleSheet*) pImpEditEngine-GetStyleSheetPool()-Make(
aName, SFX_STYLE_FAMILY_PARA );
@@ -484,12 +495,10 @@ void EditRTFParser::CreateStyleSheets()
// the SvxRTFParser haa now created the template...
if ( pImpEditEngine-GetStyleSheetPool()
pImpEditEngine-GetStatus().DoImportRTFStyleSheets() )
{
-SvxRTFStyleType* pRTFStyle = GetStyleTbl().First();
-while ( pRTFStyle )
+for (SvxRTFStyleTbl::iterator it = GetStyleTbl().begin(); it !=
GetStyleTbl().end(); ++it)
{
+SvxRTFStyleType* pRTFStyle = it-second;
CreateStyleSheet( pRTFStyle );
-
-pRTFStyle = GetStyleTbl().Next();
}
}
}
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8b9d93c..8a148a8 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -77,7 +77,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool rPool, SvStream rIn,
int bReadNewDoc )
: SvRTFParser( rIn, 5 ),
rStrm(rIn),
-aFontTbl( 16, 4 ),
pInsPos( 0 ),
pAttrPool( rPool ),
m_xDocProps( i_xDocProps ),
@@ -119,10 +118,10 @@ SvxRTFParser::~SvxRTFParser()
{
if( !aColorTbl.empty() )
ClearColorTbl();
-if( aFontTbl.Count() )
-ClearFontTbl();
-if( aStyleTbl.Count() )
+if( !aStyleTbl.empty() )
ClearStyleTbl();
+if( !aFontTbl.empty() )
+ClearFontTbl();
if(
Re: OK to get rid of scaddins?
On Tue, Feb 14, 2012 at 10:52:31AM +, Michael Meeks wrote: On Mon, 2012-02-13 at 16:06 +0100, Michael Stahl wrote: (of course i don't care if you do it for a special merged libs mode, but C++ development is already a sufficiently unproductive activity that we shouldn't make it even more so...) Is it necessary to build with full debug enabled ? how slow is it really ? [ if it takes ten minutes - how slow is it to re-build with just the bits you want symbols for re-run whatever you're debugging ?]. i find it works quite well with 8GB of RAM, except that linking takes much longer (and you better not have 3 unit tests crash concurrently otherwise gdb will lock up the box for 15 minutes until OOM killer is invoked...). So - can you give some concrete ideas of time space it is taking to link our shared libraries ? and also the growth in size that we get - what is the stripped vs. non-stripped output ? Mark prolly has some great insights as to how to improve that. Actually I was working on reducing the debug size for distro packaging, that won't immediately help in this case. There is some effort to reduce the size of the generated debug info between compiler and linker: http://gcc.gnu.org/wiki/DebugFission I wonder if the new 'gold' linker will help performance wise - have you tried it ? no, but the problem is really the space that the object files take up: they don't fit all into RAM cache, and ld is blocked on I/O most of the time (in tail_build). If we have 8Gb of debug symbols per module there is a -real- problem here; Lubos was talking of using some more magic / smaller debug option in the past: -gdwarf-4 In general using DWARF4 will allow the compiler to use a more compact representation. So if at all possible make sure you use -gdwarf-4 (on some distros this is already the default). Are you using that ? I believe we turned it off by default again for some reason or other: potentially we want to add a check for a tolerably recent toolchain and debugger on the system before defaulting to that [ it supposedly saved 30% of the size ], but you need gdb 7.3 really. Some tools don't yet support the new DWARF4 .debug_types sections. In that case you can use -gdwarf-4 -fno-debug-types-section to get the more compact DWARF4 representation except for the separate .debug_types. (This is the default for Fedora now.) Either way, it sucks to hinder ourselves from creating a more efficient library structure because of un-necessary performance problems in the toolchain ;-) The toolchain is constantly being updated to make the debuginfo more expressive and more compact, but it definitely helps to use the latest and greatest (gcc 4.6 or the 4.7-pre-release highly recommended). And for C++ linking speedups switching to the gold linker should also help. Cheers, Mark ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
SVG export feature
Hi all, Firstly, I just wanna say that I'm not sure if this is the correct list to post this, but anyway... here I go: I need to develop some sort of integration with the OpenOffice Impress in order to fully convert an odp presentation to display in an HTML5 page. Initially, I'm thinking about to improve the SVG export feature, trying to put some animations to work. I understand that this would not be an easy task, so I'm here to see if you guys have some kind of directions or even tell me if there's some related work in progress. Thanks in advance, Germano ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
one-big library approach of mozilla ...
Hi Taras, We're running into some fun performance development iteration problems with LibreOffice as we plan to merge more libraries together; and I was wondering - how does Mozilla deal with that ? How long does it take your developers to link / go around a development iteration ? are you using incremental linking ? and/or is there a different library separation for developers ? or is it basically fast to link (even with debuginfo) :-) Tips tricks appreciated; oh - and ! thanks for your hospitality during FOSDEM :-) great to catch up. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
faster java compilation (was Re: linking performance (was: Re: OK to get rid of scaddins?))
On 2012-02-14 14:22, Michael Meeks wrote: Perhaps; could it also be that we like to compile with gcc in some eight way parallel way, but when it comes to linking, we -really- don't want to bog our machine down in that way ? I wonder if we could explicitly limit parallelism of linking in some way (?) - we should prolly also do this for the java compilation which is often quite memory intensive and doesn't do well with umpteen in parallel (at least on my machine). Java compilation would be a hang of a lot faster if the build process passed all of the java files to the compiler in one go. Java is really not meant to be compiled in a file-at-a-time-model, it is meant to be compiled in a single-project-at-a-time go. Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 43399, which changed state. Bug 43399 Summary: Address data source wizard only uses evolution https://bugs.freedesktop.org/show_bug.cgi?id=43399 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
Josh Heidenreich wrote: Can it be run standalone, without the rest of doxygen? Could it be run every commit in that case until the READMEs stablalise a bit (i.e. I get something in there for every module as a starting point for this project) In principle yes, with the current script - nope. Just, if possible, use a local git repo directly, and avoid cgit. It's causing fdo much less load. Will do. Perhaps I will discuss with you further my plans for the second version (running off a database to allow for searching) at some point down the line. Would be glad to! :) Cheers, -- Thorsten pgpWIvLLise8R.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Wrong screenshot in 3.5 features page
Not sure to which mailing list should I report this, so I'm sending to the one I'm subscribed to :) In http://www.libreoffice.org/download/3-5-new-features-and-fixes/, the screenshot under The Insert Movie and Sound dialog... actually is the one for Several GTK+ right-to-left interface glitches... few lines above. Regards Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
On Tue, 2012-02-14 at 23:07 +1030, Josh Heidenreich wrote: What is the markup format to be used in the READMEs? It's a loose copy of the wikimedia syntax used in the wiki, so: - Paragraphs are separated by a blank line. - Headings are in the form == heading == (without the quotes) - Links to modules are [[module]]. - External links are [link] - Links to cgit are [git:path/to/file] Sounds rather nice; good to re-use wiki markup I suppose, I imagine the above needs documenting somewhere though; README.README ? ;-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Wrong screenshot in 3.5 features page
Hi Khaled, 2012/2/14 Khaled Hosny khaledho...@eglug.org: Not sure to which mailing list should I report this, so I'm sending to the one I'm subscribed to :) In http://www.libreoffice.org/download/3-5-new-features-and-fixes/, the screenshot under The Insert Movie and Sound dialog... actually is the one for Several GTK+ right-to-left interface glitches... few lines above. I'm sorry that we made a mistake with your feature. It is corrected now. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Remove unused code from connectivity::odbc
On Tue, 2012-02-14 at 06:06 +0100, Lionel Elie Mamane wrote: Thanks, but this one should actually be used in ODatabaseMetaData::getTableTypes. It is probably a bug that it is not, I'll convert getTableTypes to using it How about the other one ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Obsoleting RTL_CONSTASCII_USTRINGPARAM
Hi, maybe the wiki (Development/String Classes-Favored Methods Utilizing String Literals) should be updated? Otherwise RTL_CONSTASCII_USTRINGPARAM might still show some vital signs... Christina Am 10.02.2012 13:43, schrieb Michael Meeks: Hi Lubos, Rather ill today, but immensely encouraged by your work: On Thu, 2012-02-09 at 18:16 +0100, Lubos Lunak wrote: Actually, no need for a week, this one is reasonably simple. Therefore I challenge RTL_CONSTASCII_USTRINGPARAM to a fight to the death. Its death, that is. Thanks so much :-) Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] [PATCH]bug 44516 improved label and business card document creation
Hi Winfried, Winfried Donkers píše v Út 14. 02. 2012 v 07:44 +0100: Can this patch be pushed to 3.4 and 3.5 branches as well? The patch addresses problem that go way back in time (pre-LibreOffice at least). The problem is that it is partially a feature, and introduces new strings :-( - so as such, it would be better to wait for 3.6, sorry for that. I'd love to have the feature in, but I hope you understand, and 3.6 is not that far away for you? [3.6.0 final is planned for early August.] Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW][3.5]fdo#45748 wrong position for page break indicator
Hi all, Could someone review and cherry-pick -s this commit in 3-5? http://cgit.freedesktop.org/libreoffice/core/commit/?id=9baee86cbdec44c657d06f355bdba0537fb12a1a Thanks, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: faster java compilation (was Re: linking performance
On 14/02/12 13:30, Noel Grandin wrote: On 2012-02-14 14:22, Michael Meeks wrote: Perhaps; could it also be that we like to compile with gcc in some eight way parallel way, but when it comes to linking, we -really- don't want to bog our machine down in that way ? I wonder if we could explicitly limit parallelism of linking in some way (?) - we should prolly also do this for the java compilation which is often quite memory intensive and doesn't do well with umpteen in parallel (at least on my machine). Java compilation would be a hang of a lot faster if the build process passed all of the java files to the compiler in one go. Java is really not meant to be compiled in a file-at-a-time-model, it is meant to be compiled in a single-project-at-a-time go. do we _really_ invoke javac once for each source file anywhere? at least in gbuild it's invoked once per jar file (technically, per JavaClassSet that the jar depends upon), which is the only sane way to do it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Wrong screenshot in 3.5 features page
On Tue, Feb 14, 2012 at 02:37:32PM +0100, Andras Timar wrote: Hi Khaled, 2012/2/14 Khaled Hosny khaledho...@eglug.org: Not sure to which mailing list should I report this, so I'm sending to the one I'm subscribed to :) In http://www.libreoffice.org/download/3-5-new-features-and-fixes/, the screenshot under The Insert Movie and Sound dialog... actually is the one for Several GTK+ right-to-left interface glitches... few lines above. I'm sorry that we made a mistake with your feature. It is corrected now. Thanks :) Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW][PUSHED][3.5]fdo#45748 wrong position for page break indicator
Could someone review and cherry-pick -s this commit in 3-5? http://cgit.freedesktop.org/libreoffice/core/commit/?id=9baee86cbdec44c657d06f355bdba0537fb12a1a Done. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||46038 --- Comment #186 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-02-14 05:58:33 PST --- Add Bug 46038 - EDITING: CRASH when copy-paste text from particular WRITER source because of regression CRASH -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
Stephan Bergmann wrote: So no way to have a (license) comment at the head of a README? Sure - just invent a markup for it on the spot. :) Cheers, -- Thorsten pgpE3XifXWBiz.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: SVG export feature
Germano Lector wrote: Firstly, I just wanna say that I'm not sure if this is the correct list to post this, Hi Germano, oh, really, it is - as you're interested in the code itself! :) Initially, I'm thinking about to improve the SVG export feature, trying to put some animations to work. I understand that this would not be an easy task, so I'm here to see if you guys have some kind of directions or even tell me if there's some related work in progress. Have you tried Marco's awesome Impress slideshow exporter? Just tick the Tools-Options-General-enable experimental features checkbox and export a presentation that contains animations to svg - and load that in a reasonably modern browser. :) Code is here: filter/source/svg/svgexport.cxx Cheers, -- Thorsten pgpJREhGLi5De.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need help (mentor) while fixing an issue
On 13/02/12 15:19, Jan Holesovsky wrote: Hi Dag, Dag Wieers píše v Pá 10. 02. 2012 v 16:36 +0100: I found a bug in LibreOffice causing style:rel-width and style:rel-height not to accept scale as a possible value. In fact the behavior seems to be to default to 100% if anything except percentages are provided. https://bugs.freedesktop.org/show_bug.cgi?id=45884 I reported the bug, but wanted to investigate this issue. However in opengrok any queries for style:rel-width, scale or a combination give very few results and nothing I was really expecting. Can someone point me to where I should start debugging this ? So I think (but have no proof, I was only searching in opengrok), that it is here: http://opengrok.libreoffice.org/xref/core/xmloff/source/text/XMLTextFrameContext.cxx#933 It seems to count on the possibility of the 'scale' value, but why does it not work for you needs to be debugged, I suppose. that's for rel-width; rel-height is apparently handled here: http://opengrok.libreoffice.org/xref/core/xmloff/source/text/XMLTextFrameContext.cxx#974 http://opengrok.libreoffice.org/xref/core/xmloff/source/text/XMLTextFrameContext.cxx#694 so a property IsSyncHeightToWidth is set at the frame; why that doesn't have the expected result i don't know. regards, michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: faster java compilation (was Re: linking performance
On 2012-02-14 15:49, Michael Stahl wrote: do we _really_ invoke javac once for each source file anywhere? at least in gbuild it's invoked once per jar file (technically, per JavaClassSet that the jar depends upon), which is the only sane way to do it. You are correct sir. But I think I saw that in some places there are quite a few JavaClassSet's defined for a given jar? Actually, I'm not sure, it was just something I saw when I was digging around in that area, could be my memory is at fault. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] [REVIEW:3-5,3-4] odbc 64 bits crash
Yet another odbc on 64 bit crash because of wrong buffer size. This is supposed to be a SQLLEN but was hardcoded as 4 bytes. You can see that e.g. in connectivity/source/drivers/odbcbase/OPreparedStatement.cxx, OPreparedStatement::setNull: sal_Int8* lenBuf = getLengthBuf (parameterIndex); *(SQLLEN*)lenBuf = SQL_NULL_DATA; getLengthBuf just returns the paramLength member of the corresponding OBoundParam. On my machine in my (debug) build, that (or maybe some other piece of code, such as line 875: memcpy (lenBuf, atExec, sizeof (atExec)); line 882: N3SQLBindParameter(m_aStatementHandle, (SQLUSMALLINT)ParameterIndex, (SQLUSMALLINT)SQL_PARAM_INPUT, Ctype, (SQLSMALLINT)SQLtype, (SQLULEN)length, 0, dataBuf, sizeof(ParameterIndex), (SQLLEN*)lenBuf); ) would overwrite malloc's metadata, and thus in the OBoundParameter destructor: delete [] paramLength; would call abort() because bad pointer. Please apply to libreoffice-3-4 and libreoffice-3-5. Thanks, BTW, even after export MALLOC_CHECK_=3, I wouldn't get free() to properly complain on stderr, gdb showed malloc_printerr called with action=2 instead of action=3. Quid? -- Lionel From 84d21e4de26bd69f7ca5b10f2c72779f07e11347 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane lio...@mamane.lu Date: Tue, 14 Feb 2012 14:54:03 +0100 Subject: [PATCH] odbc 64 bit crash: correct buffer length allocation for a SQLLEN --- connectivity/source/inc/odbc/OBoundParam.hxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 2310a2e..99a4901 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -68,7 +68,7 @@ namespace connectivity // to a Java sal_Int32. The jdbcodbc 'C' bridge provides an // interface to do this. -paramLength = new sal_Int8[4]; +paramLength = new sal_Int8[sizeof(SQLLEN)]; } // -- 1.7.7.3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
Just a word of encouragement: thanks for working on that, I'm looking forward to see the impact on the build with LANG=all :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] [REVIEW:3-5,3-4] api documentation error
I corrected an error (bad link/reference) in the API documentation for com::sun::star::sdbc::XDatabaseMetaData. Do we backport that kind of things? It would suck somewhat for our on-line version to be wrong until after the release of 3.6. So I propose we backport this to 3.5, and maybe 3.4, too? -- Lionel From 7535373fa693ddff5311054800efcc602cdcacd9 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane lio...@mamane.lu Date: Tue, 14 Feb 2012 06:19:08 +0100 Subject: [PATCH] correct documentation of com::sun::star::sdbc::XDatabaseMetaData --- offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 16 +--- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl index 4f06bb5..abee6d2 100644 --- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl +++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl @@ -45,17 +45,19 @@ the form of type scope=com::sun::star::sdbcXResultSet/type objects. -You can use the normal type scope=com::sun::star::sdbcXResultSet/type +You can use the normal type scope=com::sun::star::sdbcXRow/type +(or type scope=com::sun::star::sdbXColumn/type) methods such as -member scope=com::sun::star::sdbcXResultSet::getString()/member +member scope=com::sun::star::sdbcXRow::getString()/member and -member scope=com::sun::star::sdbcXResultSet::getInt()/member +member scope=com::sun::star::sdbcXRow::getInt()/member to retrieve the data from these XResultSets. If a given form of metadata is not available, these methods should throw a type scope=com::sun::star::sdbcSQLException/type . -That a value of type scope=com::sun::star::sdbcXResultSet/type is NULL/ -can be checked with the method member scope=com::sun::star::sdbcXResultSet::wasNull()/member. +After calling one of the getXXX() methods, +one can check whether that value is NULL/ +with the method member scope=com::sun::star::sdbcXRow::wasNull()/member. In the text only (may be NULL/) is mentioned for this case. /p pSome of these methods take arguments that are String patterns. These @@ -69,8 +71,7 @@ A type scope=com::sun::star::sdbcSQLException/type will be thrown if a driver does not support -a meta data method. In the case of methods that return an XResultSet, +a metadata method. In the case of methods that return an XResultSet, either an XResultSet (which may be empty) is returned or a SQLException is thrown./p */ -- 1.7.7.3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Help - minor updates
thanks for your patches! One thing I noticed, is it possible to replace StarOffice with LibreOffice instead of OpenOffice in patch #3? Hi, I think it is not good idea, because the text is related to version 1.1 and there was no LibreOffice 1.1. S. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] Referencing bugs in commits
Hi, Markus has implemented a nice feature that should help keeping the bugs up to date: whenever you are committing / pushing to git, and you reference the bugs.freedesktop.org bug in the commit message, it will automatically appear as a comment in the bug :-) The bug reference has to have fdo#ABCDE form (where ABCDE is the bug number), and has to be at the first line of the commit (it does not matter where on that line). So eg. when you write git commit log as: - 8 - fdo#45748: Don't use empty pages for computing the page break position - 8 - It will result in the following comment in bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45748#c7 I am sorry for the trouble with the UTF-8 encoding, we'll fix that later. Also, the comments are so far created with my bugzilla account, we'll switch to a bug alias soon. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [REVIEW 3-5] Adapt SDK to changed paths in LO installation
On 14/02/12 10:48, Stephan Bergmann wrote: Please review and cherry-pick to libreoffice-3-5 the commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1 Resolves rhbz#789622: Adapt SDK to changed paths in LO installation. pushed to libreoffice-3-5: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=249fdaa87062fc8a6a7d5a068a7d1401b6c37b5c ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED][3-5] Re: [PATCH] [REVIEW:3-5,3-4] api documentation error
On 14/02/12 15:46, Lionel Elie Mamane wrote: I corrected an error (bad link/reference) in the API documentation for com::sun::star::sdbc::XDatabaseMetaData. Do we backport that kind of things? It would suck somewhat for our on-line version to be wrong until after the release of 3.6. So I propose we backport this to 3.5, and maybe 3.4, too? pushed to libreoffice-3-5: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=0a28ddf2084f86743e229667ae2c9b7e4f95e49e hmm.. am too lazy for -3-4 because probably most people read this stuff on api.libreoffice.org and i guess that should be generated from latest stable release. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [REVIEW] fix RTF import of text frames with exact height
On 14/02/12 11:35, Miklos Vajna wrote: Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=e0328096dc21ce12d15db2045074e7860872570f Could someone review and cherry-pick to -3-5, please? makes sense; ah, that's one of those controls that encode an extra bit into the sign of the parameter :) http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=b88db173e610da5058099d5524e8fa7db2fc733d ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
