[PATCH] Added numberformat.ui and modified labels of present ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1234 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/1234/1 Added numberformat.ui and modified labels of present ui Change-Id: I1a58b92044a6db54cffbabc46e054c9638367000 --- A sw/uiconfig/swriter/ui/numberformat.ui 1 file changed, 462 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1234 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a58b92044a6db54cffbabc46e054c9638367000 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5da8bdb4d4bde5175c9e89182956043ffc991c50 Author: Andras Timar ati...@suse.com Date: Tue Dec 4 09:26:01 2012 +0100 Updated core Project: help 0c00fcce7d3e777b1734f97ef67c28c609b99f44 forgot to add this makefile diff --git a/helpcontent2 b/helpcontent2 index 7c70118..0c00fcc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7c70118da4116a56150f0c4f403bc9360ba249f9 +Subproject commit 0c00fcce7d3e777b1734f97ef67c28c609b99f44 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/swriter/librelogo/makefile.mk | 24 1 file changed, 24 insertions(+) New commits: commit 0c00fcce7d3e777b1734f97ef67c28c609b99f44 Author: Andras Timar ati...@suse.com Date: Tue Dec 4 09:26:01 2012 +0100 forgot to add this makefile Change-Id: Ic532d55d08d03b5e9a0f68756fe7f24046f809db diff --git a/source/text/swriter/librelogo/makefile.mk b/source/text/swriter/librelogo/makefile.mk new file mode 100644 index 000..867c2fd --- /dev/null +++ b/source/text/swriter/librelogo/makefile.mk @@ -0,0 +1,24 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ = ../../../.. +PRJNAME = helpcontent2 +PACKAGE = text/swriter/librelogo +TARGET = text_swriter_librelogo +MODULE = swriter + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)/settings.pmk + +XHPFILES = LibreLogo.xhp + +.INCLUDE : target.mk +.INCLUDE : tg_help.mk + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo54473.rtf | 10 ++
sw/qa/extras/rtfimport/rtfimport.cxx |9 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 41890bf714803969515578b47e63fa9730ea7090
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 4 10:38:53 2012 +0100
fdo#54473 fdo#57133 fix RTF import of character styles
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd
Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863
diff --git a/sw/qa/extras/rtfimport/data/fdo54473.rtf
b/sw/qa/extras/rtfimport/data/fdo54473.rtf
new file mode 100644
index 000..7bb6208
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo54473.rtf
@@ -0,0 +1,10 @@
+{\rtf1\ansi
+{\stylesheet
+{\*\cs16\ul Anot;}
+{\*\cs15\i ForeignTxt;}
+}
+{\cs16\ul Text }
+with
+{\cs15\i character }
+formatting
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 7853fc3..826ca96 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -127,6 +127,7 @@ public:
void testFdo48442();
void testFdo55525();
void testFdo57708();
+void testFdo54473();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -204,6 +205,7 @@ void Test::run()
{fdo48442.rtf, Test::testFdo48442},
{fdo55525.rtf, Test::testFdo55525},
{fdo57708.rtf, Test::testFdo57708},
+{fdo54473.rtf, Test::testFdo54473},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -941,6 +943,13 @@ void Test::testFdo57708()
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws-getCount());
}
+void Test::testFdo54473()
+{
+// The problem was that character styles were not imported due to a typo.
+CPPUNIT_ASSERT_EQUAL(OUString(Anot),
getPropertyOUString(getRun(getParagraph(1), 1, Text ), CharStyleName));
+CPPUNIT_ASSERT_EQUAL(OUString(ForeignTxt),
getPropertyOUString(getRun(getParagraph(1), 3, character ),
CharStyleName));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9c988d7..aa90d3b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2673,7 +2673,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
break;
case RTF_CS:
-if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET)
+if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET ||
m_aStates.top().nDestinationState == DESTINATION_STYLEENTRY)
{
m_nCurrentStyleIndex = nParam;
m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94ff635f806536b358731d046b7d9e6ce48eb0a2 Author: Andras Timar ati...@suse.com Date: Tue Dec 4 11:02:32 2012 +0100 Updated core Project: translations 29912248a458e96bf58166bf780bef9f535002aa Slovenian update/fixes diff --git a/translations b/translations index a24d651..2991224 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit a24d6519ec38959686a76da10b9f0de190c20355 +Subproject commit 29912248a458e96bf58166bf780bef9f535002aa ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Dailies by banch?
Hi Rainer, On Tue, Dec 04, 2012 at 07:47:28AM +0100, Rainer Bielefeld wrote: But If we could get some kind of Table of Contents what contains al necessary info (Tinderbox, Pull time, OS, Branch, ...), can be sorted, searched and may be even configured for personal needs that would be a good solution. That would be a whole different beast effortwise. If you find someone interested to do it, sure, but I guess our infra team is already overcommited as is ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc sal/qa
sal/inc/rtl/string.hxx |7 +--
sal/inc/rtl/ustring.hxx |9 ++---
sal/qa/rtl/strings/test_ostring_concat.cxx |1 +
sal/qa/rtl/strings/test_oustring_concat.cxx |1 +
4 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 4e593d047b9c10de085dffa3fa3dd4602361c407
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 4 11:20:22 2012 +0100
Fix fast concat of empty strings
Change-Id: Ice9c6974f44be3bc4c9b3533de2a9beb5b146ca5
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 2c7a43d..aeb7528 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -262,8 +262,11 @@ public:
const int l = c.length();
rtl_String* buffer = NULL;
rtl_string_new_WithLength( buffer, l );
-char* end = c.addData( buffer-buffer );
-buffer-length = end - buffer-buffer;
+if (l != 0)
+{
+char* end = c.addData( buffer-buffer );
+buffer-length = end - buffer-buffer;
+}
pData = buffer;
}
#endif
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 534bd88..ec9f90e 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -330,9 +330,12 @@ public:
const int l = c.length();
rtl_uString* buffer = NULL;
rtl_uString_new_WithLength( buffer, l ); // TODO this clears, not
necessary
-sal_Unicode* end = c.addData( buffer-buffer );
-buffer-length = end - buffer-buffer;
-// TODO realloc in case buffer-length is noticeably smaller than l ?
+if (l != 0)
+{
+sal_Unicode* end = c.addData( buffer-buffer );
+buffer-length = end - buffer-buffer;
+// TODO realloc in case buffer-length is noticeably smaller than
l?
+}
pData = buffer;
}
#endif
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx
b/sal/qa/rtl/strings/test_ostring_concat.cxx
index a79b2da..46457dd 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -47,6 +47,7 @@ CPPUNIT_TEST_SUITE_END();
void test::ostring::StringConcat::check()
{
// All the extra () are to protect commas againsts being treated as separators
of macro arguments.
+CPPUNIT_ASSERT_EQUAL( OString(), OString(OString() + OString()) );
CPPUNIT_ASSERT_EQUAL( OString( foobar ), OString( OString( foo ) +
OString( bar )));
TYPES_ASSERT_EQUAL(( typeid( OStringConcat OString, OString )), typeid(
OString( foo ) + OString( bar )));
CPPUNIT_ASSERT_EQUAL( OString( foobar ), OString( OString( foo ) +
bar ));
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx
b/sal/qa/rtl/strings/test_oustring_concat.cxx
index 0cc2512..4f650dc 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -47,6 +47,7 @@ CPPUNIT_TEST_SUITE_END();
void test::oustring::StringConcat::check()
{
// All the extra () are to protect commas againsts being treated as separators
of macro arguments.
+CPPUNIT_ASSERT_EQUAL( OUString(), OUString(OUString() + OUString()) );
CPPUNIT_ASSERT_EQUAL( OUString( foobar ), OUString( OUString( foo ) +
OUString( bar )));
TYPES_ASSERT_EQUAL(( typeid( OUStringConcat OUString, OUString )),
typeid( OUString( foo ) + OUString( bar )));
CPPUNIT_ASSERT_EQUAL( OUString( foobar ), OUString( OUString( foo ) +
bar ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#54473 fdo#57133 fix RTF import of character styles
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1235 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/1235/1 fdo#54473 fdo#57133 fix RTF import of character styles Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd (cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090) Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1235 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Bug 1021750] Re: add gerrit review command
Hi David, On Tue, Dec 04, 2012 at 12:25:13AM +0100, David Ostrovsky david.ostrov...@gmx.de wrote: i added review command to git-review: https://review.openstack.org/17423 Now you can review gerrit patch without using web browser, and even add multiline comment message in your favorite editor, i guess vim, or whatever GIT_EDITOR is set ;-) Oh, that sounds great! :-) The interface is a bit rough, but it's a great start -- thanks for looking into that! Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: random number generators for calc
What about implementation in random.cxx and creating random.hxx so all the random stuff is in one place? Why do you want this abstraction? Following KISS I would just start implementing the functions in ScInterpreter and extract commonly used parts into an own method. If at some point other parts of Libreoffice also need random functions with known statistical properties we can still extract them. I'm happy to propose a patch this way. Just need to be aware that RANDBETWEEN() which is part of scaddins would also need a replacement of rand(). Also, another consideration is the way to implement different non-uniform distribution, just wondering if anyone has a strong view on this: (1) implementation similar to rand() and srand(), where the state of the generator is saved in a global variable (which is not exposed via a header file and can only be changed by srand), and all other non-uniform generators draw from the same rand(). this requires an srand() call ideally at the start of libreoffice or calc, currently done in ./sc/source/core/data/global.cxx (2) each rand_nonuniform() function draws from it's own private rand() generator with its own state, which is defined as a static variable and initialised at the first call. For a general purpose library one would probably do (1) (or (1) and encapsulated in a class) but for calc both versions are fine in my opinion. Memory requirements for boost::mt19937 is 625*sizeof(uint32_t) so I guess even if we had 10 copies (one for each non-uniform rand) of it that wouldn't be a problem? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - config_host.mk.in configure.ac connectivity/Module_connectivity.mk moz/extractfiles.mk moz/makefile.mk moz/README moz/zipped nss/makefile.mk nss/README python3/pyt
config_host.mk.in | 16 - configure.ac| 324 connectivity/Module_connectivity.mk |6 moz/README |4 moz/extractfiles.mk | 131 -- moz/makefile.mk | 248 --- moz/zipped/makefile.mk | 71 --- nss/README |2 nss/makefile.mk |6 python3/UnpackedTarball_python3.mk |1 python3/python-3.3.0-ncurses.patch | 11 - sal/inc/rtl/strbuf.hxx |1 sal/inc/rtl/string.hxx |1 sal/inc/rtl/ustrbuf.hxx |1 sal/inc/rtl/ustring.hxx |1 15 files changed, 109 insertions(+), 715 deletions(-) New commits: commit a0c53a961a0af21f69f592b43799cd635c994810 Author: Mathias Michel m...@gmx.fr Date: Tue Dec 4 03:35:14 2012 +0100 First fix for fdo#56902 Restrict moz to windows, and build vars also impacts nss, connectivity Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282 Reviewed-on: https://gerrit.libreoffice.org/1233 Reviewed-by: David Ostrovsky david.ostrov...@gmx.de Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/config_host.mk.in b/config_host.mk.in index f2e4a1d..0397212 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -39,7 +39,6 @@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ export BSH_JAR=@BSH_JAR@ export BUILD_DMAKE=@BUILD_DMAKE@ -export BUILD_MOZAB=@BUILD_MOZAB@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ export BUILD_TYPE=@BUILD_TYPE@ @@ -91,7 +90,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@ export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@ export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@ export debug=@ENABLE_DEBUG@ -export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@ export DEFAULT_TO_ENGLISH_FOR_PACKING=yes export DEVINSTALLDIR=@DEVINSTALLDIR@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ @@ -170,6 +168,7 @@ export ENABLE_ZENITY=@ENABLE_ZENITY@ export EPM=@EPM@ export EPM_FLAGS=@EPM_FLAGS@ export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@ +export EXTMSV80=$(gb_Space)@EXTMSV80@ @x_Cygwin@ export FIND=@WIN_FIND@ export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@ export FLEX=@FLEX@ @@ -387,15 +386,11 @@ export MKDEPENDSOLVER=TRUE export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ export MOC=@MOC@ -export MOZILLABUILD=@MOZILLABUILD@ export NPAPI_HEADERS_CFLAGS=$(gb_SPACE)@NPAPI_HEADERS_CFLAGS@ -export MOZILLA_VERSION=@MOZILLA_VERSION@ -export MOZ_FLAVOUR=@MOZ_FLAVOUR@ -export MOZ_INC=@MOZ_INC@ -export MOZ_LIB=@MOZ_LIB@ -export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@ export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@ +export MSVC80_MNFST=@MSVC80_MNFST@ +export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@ export MYSQL_DEFINES=@MYSQL_DEFINES@ export MYSQL_INC=@MYSQL_INC@ export MYSQL_LIB=@MYSQL_LIB@ @@ -408,6 +403,7 @@ export NM=@NM@ export nodep=@nodep@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ +export NSSBUILDTOOLS=@NSSBUILDTOOLS@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ @@ -444,7 +440,6 @@ export POPPLER_CFLAGS=$(gb_SPACE)@POPPLER_CFLAGS@ export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@ export POSTGRESQL_INC=@POSTGRESQL_INC@ export POSTGRESQL_LIB=@POSTGRESQL_LIB@ -export PREBUILD_MOZAB=@PREBUILD_MOZAB@ export PREFIXDIR=@PREFIXDIR@ export PRODUCT=@PRODUCT@ export PRODUCTNAME=@PRODUCTNAME@ @@ -548,7 +543,6 @@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ -export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ export SYSTEM_MYSQL=@SYSTEM_MYSQL@ export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ @@ -611,7 +605,7 @@ export WITH_KRB5=@WITH_KRB5@ export WITH_LANG=@WITH_LANG@ export WITH_LANG_LIST=@WITH_LANG_LIST@ export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@ -export WITH_MOZILLA=@WITH_MOZILLA@ +export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@ export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@ export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@ export WITH_STLPORT=@WITH_STLPORT@ diff --git a/configure.ac b/configure.ac index e0b8342..ff95721 100644 --- a/configure.ac +++ b/configure.ac @@ -687,10 +687,10 @@ AC_ARG_ENABLE(pch, [DEPRECATED : is ignored]) ) -AC_ARG_ENABLE(mozilla, -AS_HELP_STRING([--enable-mozilla], -[LibreOffice can include a strangely hacked up Mozilla binary for your - platform, to build with this version, use this option.])
[PUSHED] First fix for fdo#56902
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1233 Approvals: David Ostrovsky: Looks good to me, but someone else must approve Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1233 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/unomodel.cxx | 24
basctl/source/basicide/unomodel.hxx | 12
2 files changed, 36 insertions(+)
New commits:
commit ab96b65e0d4fab541d8b31b46e3f37db0fb548b5
Author: Noel Power noel.po...@suse.com
Date: Tue Dec 4 10:53:56 2012 +
fix for fdo#57836 throw when attempting to store basicide model
Change-Id: I8769a63be61d45817757be3ad23ffc7b01173041
diff --git a/basctl/source/basicide/unomodel.cxx
b/basctl/source/basicide/unomodel.cxx
index 0ee8f3a..1b6122c 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -117,6 +117,30 @@ uno::Reference uno::XInterface SAL_CALL
SIDEModel_createInstance(
return uno::Reference uno::XInterface ( pShell-GetModel() );
}
+// XStorable
+void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException)
+{
+notImplemented();
+}
+
+void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString, const
uno::Sequence PROPERTYVALUE )
+throw (io::IOException, uno::RuntimeException)
+{
+notImplemented();
+}
+
+void SAL_CALL SIDEModel::storeToURL( const ::rtl::OUString,
+const uno::Sequence PROPERTYVALUE )
+throw (io::IOException, uno::RuntimeException)
+{
+notImplemented();
+}
+
+void SIDEModel::notImplemented() throw ( io::IOException )
+{
+throw io::IOException(Can't store IDE model, uno::Reference
uno::XInterface () );
+}
+
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/unomodel.hxx
b/basctl/source/basicide/unomodel.hxx
index 87b230a..4d6fd0c 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -30,6 +30,7 @@ namespace basctl
class SIDEModel : public SfxBaseModel,
public com::sun::star::lang::XServiceInfo
{
+void notImplemented() throw ( ::com::sun::star::io::IOException );
public:
SIDEModel( SfxObjectShell *pObjSh = 0 );
virtual ~SIDEModel();
@@ -49,6 +50,17 @@ public:
throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
+// XStorable2
+virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence
PROPERTYVALUE )
+throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) {
notImplemented(); }
+// XStorable
+virtual void SAL_CALL store() throw (::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL storeAsURL( const ::rtl::OUString sURL,
+const ::com::sun::star::uno::Sequence PROPERTYVALUE
seqArguments)
+throw (::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL storeToURL( const ::rtl::OUString sURL,
+const ::com::sun::star::uno::Sequence PROPERTYVALUE
seqArguments)
+throw (::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
static ::com::sun::star::uno::Sequence OUString
getSupportedServiceNames_Static();
static OUString getImplementationName_Static();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3d43dc3318a0692287e877b2e70e873372d2c248
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 4 10:38:53 2012 +0100
fdo#54473 fdo#57133 fix RTF import of character styles
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd
(cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090)
Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863
Reviewed-on: https://gerrit.libreoffice.org/1235
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a910401..9a348b8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2479,7 +2479,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
break;
case RTF_CS:
-if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET)
+if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET ||
m_aStates.top().nDestinationState == DESTINATION_STYLEENTRY)
{
m_nCurrentStyleIndex = nParam;
m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlimport/data/tableborder-finedash.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 15 +++
2 files changed, 15 insertions(+)
New commits:
commit acef2d6cd075705eab015a4125badeca39078ef1
Author: Eilidh McAdam eil...@lanedo.com
Date: Tue Nov 20 00:45:25 2012 +
docx fine dashed table border import test case.
Change-Id: I27ee8e360b8fd530f8cfefc58c8a0f96d706b979
Reviewed-on: https://gerrit.libreoffice.org/1125
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/qa/extras/ooxmlimport/data/tableborder-finedash.docx
b/sw/qa/extras/ooxmlimport/data/tableborder-finedash.docx
new file mode 100644
index 000..003167a
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/tableborder-finedash.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8071f48..7f78cfe 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -50,6 +50,7 @@
#include com/sun/star/table/ShadowFormat.hpp
#include com/sun/star/view/XSelectionSupplier.hpp
#include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/TableBorder2.hpp
#include vcl/svapp.hxx
@@ -108,6 +109,7 @@ public:
void testN785767();
void testN773061();
void testN780645();
+void testFineTableDash();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -169,6 +171,7 @@ void Test::run()
{n785767.docx, Test::testN785767},
{n773061.docx, Test::testN773061},
{n780645.docx, Test::testN780645},
+{tableborder-finedash.docx, Test::testFineTableDash}
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1009,6 +1012,7 @@ void Test::testFdo52208()
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
}
+
void Test::testN785767()
{
uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
@@ -1043,6 +1047,17 @@ void Test::testN780645()
CPPUNIT_ASSERT_EQUAL(sal_Int16(2135), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(1),
TableColumnSeparators)[0].Position); // was 1999
}
+void Test::testFineTableDash()
+{
+// The problem was that finely dashed borders on tables were unsupported
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xTableProperties(xTables-getByIndex(0), uno::UNO_QUERY);
+table::TableBorder2 aBorder;
+xTableProperties-getPropertyValue(TableBorder2) = aBorder;
+CPPUNIT_ASSERT_EQUAL(aBorder.RightLine.LineStyle,
table::BorderLineStyle::FINE_DASHED);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 67f42de08bb5d075d554cf5aa1a4c106fe9e4f5c Author: Eilidh McAdam eil...@lanedo.com Date: Thu Nov 15 13:57:47 2012 + Export finely dashed borders to docx. Change-Id: I4a65f8e874abe406a9cd2d3a088ea52f0850088f Reviewed-on: https://gerrit.libreoffice.org/1124 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b55daeb..b4dbee9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1398,6 +1398,9 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co case table::BorderLineStyle::INSET: pVal = ( sal_Char* )inset; break; +case table::BorderLineStyle::FINE_DASHED: +pVal = ( sal_Char* )dashSmallGap; +break; case table::BorderLineStyle::NONE: default: break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source offapi/com svtools/inc svtools/source
editeng/source/items/borderline.cxx | 11 ++-
editeng/source/items/frmitems.cxx |2 +-
offapi/com/sun/star/table/BorderLineStyle.idl |8
svtools/inc/svtools/ctrlbox.hxx |1 +
svtools/source/control/ctrlbox.cxx|7 +++
5 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 7d632ff29e601c2e680c4a689997fbf552592a4b
Author: Eilidh McAdam eil...@lanedo.com
Date: Thu Nov 15 00:29:58 2012 +
Support added for fine dashing on table borders.
When reading in docx documents, fine dashing provides a better visual
match for some border types.
Added in this patch:
- FINE_DASHED in BorderLineStyle UNO enum and in internals
- Import of docx table borders using this border style
Change-Id: I39cfa18c915ec94d8e4ecfc6a2ca637076d1e468
Reviewed-on: https://gerrit.libreoffice.org/1123
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 1904916..646a348 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -128,9 +128,11 @@ ConvertBorderStyleFromWord(int const nWordLineStyle)
return DOTTED;
break;
case 7:
-case 22:
return DASHED;
break;
+case 22:
+return FINE_DASHED;
+break;
// then the shading beams which we represent by a double line
case 23:
return DOUBLE;
@@ -216,6 +218,10 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle,
double const fWidth,
case DOTTED:
case DASHED:
return fWidth;
+
+// Display a minimum effective border width of 1pt
+case FINE_DASHED:
+return (fWidth 0 fWidth 20) ? 20 : fWidth;
break;
// Double lines
@@ -270,6 +276,7 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle,
double const fWidth)
case SOLID:
case DOTTED:
case DASHED:
+case FINE_DASHED:
return fWidth;
break;
@@ -335,6 +342,7 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle
nStyle )
case SOLID:
case DOTTED:
case DASHED:
+case FINE_DASHED:
aImpl = BorderWidthImpl( CHANGE_LINE1, 1.0 );
break;
@@ -514,6 +522,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
case SOLID:
case DOTTED:
case DASHED:
+case FINE_DASHED:
::std::swap( nOut, nIn);
break;
default:
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 6f410c6..5ee12a8 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1794,7 +1794,7 @@ sal_Bool
SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2 rLine,
SvxBorderLine rSvxLine, sal_Bool bConvert)
{
SvxBorderStyle const nStyle =
-(rLine.LineStyle 0 || INSET rLine.LineStyle)
+(rLine.LineStyle 0 || BORDER_LINE_STYLE_MAX rLine.LineStyle)
? SOLID // default
: rLine.LineStyle;
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl
b/offapi/com/sun/star/table/BorderLineStyle.idl
index 0007118..7613272 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -90,6 +90,14 @@ constants BorderLineStyle
/** Inset border line.
*/
const short INSET = 13;
+
+/** Finely dashed border line.
+ */
+const short FINE_DASHED = 14;
+
+/** Maximum valid border line style value.
+ */
+const short BORDER_LINE_STYLE_MAX = 14;
};
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index a6b26b8..2d6e6a2 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -44,6 +44,7 @@ typedef ::std::vector FontInfo ImplFontList;
#define STYLE_SOLID( ( sal_uInt16 ) 0 )
#define STYLE_DOTTED ( ( sal_uInt16 ) 1 )
#define STYLE_DASHED ( ( sal_uInt16 ) 2 )
+#define STYLE_FINE_DASHED ( ( sal_uInt16 ) 14 )
#define STYLE_NONE ( ( sal_uInt16 ) -1)
#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 017422f..dd739d4 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -615,6 +615,13 @@ namespace svtools
aPattern.push_back( 20 );
}
break;
+case STYLE_FINE_DASHED:
+if ( eUnit == MAP_PIXEL )
+{
+
[PUSHED] Export finely dashed borders to docx.
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1124 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1124 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a65f8e874abe406a9cd2d3a088ea52f0850088f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] docx fine dashed table border import test case.
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1125 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1125 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27ee8e360b8fd530f8cfefc58c8a0f96d706b979 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#54473 fdo#57133 fix RTF import of character styles
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1235 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1235 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Support added for fine dashing on table borders.
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1123 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1123 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39cfa18c915ec94d8e4ecfc6a2ca637076d1e468 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eilidh McAdam eilidh.mca...@gmail.com Gerrit-Reviewer: Eilidh McAdam eilidh.mca...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/inc
vcl/inc/vcl/builder.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 42b0bb5fc9d660342cecd8b6db7cd42c9be62629
Author: Jack Leigh leigh...@gmx.se
Date: Mon Dec 3 20:20:23 2012 +
clarify ui warnings in builder
Change-Id: I3d55ba0e8d284a69d6ce7d3d7ec49d4ab5d9b682
Reviewed-on: https://gerrit.libreoffice.org/1230
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 82bd805..fb47a0c 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -151,9 +151,9 @@ public:
template typename T T* get(T* ret, OString sID)
{
Window *w = get_by_name(sID);
-SAL_WARN_IF(!w, vcl.layout, widget sID.getStr() not found
in .ui);
+SAL_WARN_IF(!w, vcl.layout, widget \ sID.getStr() \ not
found in .ui);
SAL_WARN_IF(!dynamic_castT*(w),
-vcl.layout, widget sID.getStr() needs to have type
typeid(T).name());
+vcl.layout, .ui widget \ sID.getStr() \ needs to
correspond to vcl type typeid(T).name());
assert(w dynamic_castT*(w));
ret = static_castT*(w);
return ret;
@@ -163,7 +163,7 @@ public:
{
Window *w = get_by_name(sID);
SAL_WARN_IF(w !dynamic_castT*(w),
-vcl.layout, widget sID.getStr() needs to have type
typeid(T).name());
+vcl.layout, .ui widget \ sID.getStr() \ needs to
correspond to vcl type typeid(T).name());
assert(!w || dynamic_castT*(w));
return static_castT*(w);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] clarify ui warnings in builder
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1230 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1230 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d55ba0e8d284a69d6ce7d3d7ec49d4ab5d9b682 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - src/docdraw.py
src/docdraw.py | 82 +
1 file changed, 82 insertions(+)
New commits:
commit babae6f628b21851347f2da363ea9272e9613997
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 4 12:19:08 2012 +0100
dump OfficeArtFOPT
diff --git a/src/docdraw.py b/src/docdraw.py
index 0051a9e..82bc79f 100644
--- a/src/docdraw.py
+++ b/src/docdraw.py
@@ -232,6 +232,71 @@ class OfficeArtClientData(DOCDirStream):
print '/clientData'
assert self.pos == pos + rh.recLen
+class OfficeArtFOPTEOPID(DOCDirStream):
+The OfficeArtFOPTEOPID record specifies the header for an entry in a
property table.
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.parent = parent
+
+def dump(self):
+buf = self.readuInt16()
+self.printAndSet(opid, buf 0x3fff) # 1..14th bits
+self.printAndSet(fBid, self.getBit(buf, 14))
+self.printAndSet(fComplex, self.getBit(buf, 15))
+self.parent.pos = self.pos
+
+class OfficeArtFOPTE(DOCDirStream):
+The OfficeArtFOPTE record specifies an entry in a property table.
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.parent = parent
+
+def dump(self):
+print 'opid'
+self.opid = OfficeArtFOPTEOPID(self)
+self.opid.dump()
+print '/opid'
+self.printAndSet(op, self.readInt32())
+self.parent.pos = self.pos
+
+class OfficeArtRGFOPTE(DOCDirStream):
+The OfficeArtRGFOPTE record specifies a property table.
+def __init__(self, parent, name):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.name = name
+self.parent = parent
+
+def dump(self):
+print '%s type=OfficeArtRGFOPTE offset=%d' % (self.name,
self.pos)
+for i in range(self.parent.rh.recInstance):
+print 'rgfopte index=%d offset=%d' % (i, self.pos)
+entry = OfficeArtFOPTE(self)
+entry.dump()
+if entry.opid.fComplex:
+print 'todo what=OfficeArtRGFOPTE: fComplex != 0
unhandled/'
+print '/rgfopte'
+print '/%s' % self.name
+self.parent.pos = self.pos
+
+class OfficeArtFOPT(DOCDirStream):
+The OfficeArtFOPT record specifies a table of OfficeArtRGFOPTE
properties.
+def __init__(self, officeArtSpContainer, pos):
+DOCDirStream.__init__(self, officeArtSpContainer.bytes)
+self.pos = pos
+self.officeArtSpContainer = officeArtSpContainer
+
+def dump(self):
+print 'shapePrimaryOptions type=OfficeArtFOPT offset=%d' %
self.pos
+self.rh = OfficeArtRecordHeader(self, rh)
+self.rh.dump()
+pos = self.pos
+OfficeArtRGFOPTE(self, fopt).dump()
+print '/shapePrimaryOptions'
+assert self.pos == pos + self.rh.recLen
+
class OfficeArtSpContainer(DOCDirStream):
The OfficeArtSpContainer record specifies a shape container.
def __init__(self, parent, pos):
@@ -318,6 +383,7 @@ recMap = {
0xf008: OfficeArtFDG,
0xf009: OfficeArtFSPGR,
0xf00a: OfficeArtFSP,
+0xf00b: OfficeArtFOPT,
0xf011: OfficeArtClientData,
0xf11e: OfficeArtSplitMenuColorContainer,
}
commit 29a64bf55ff781f0bf81483fed3b5c42cdbf6fbf
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 4 11:48:32 2012 +0100
dump OfficeArtClientData
diff --git a/src/docdraw.py b/src/docdraw.py
index 26b4ccf..0051a9e 100644
--- a/src/docdraw.py
+++ b/src/docdraw.py
@@ -217,6 +217,21 @@ class OfficeArtFSP(DOCDirStream):
print '/shapeProp'
assert self.pos == pos + rh.recLen
+class OfficeArtClientData(DOCDirStream):
+def __init__(self, officeArtSpContainer, pos):
+DOCDirStream.__init__(self, officeArtSpContainer.bytes)
+self.pos = pos
+self.officeArtSpContainer = officeArtSpContainer
+
+def dump(self):
+print 'clientData type=OfficeArtClientData offset=%d' % self.pos
+rh = OfficeArtRecordHeader(self, rh)
+rh.dump()
+pos = self.pos
+self.printAndSet(data, self.readuInt32())
+print '/clientData'
+assert self.pos == pos + rh.recLen
+
class OfficeArtSpContainer(DOCDirStream):
The OfficeArtSpContainer record specifies a shape container.
def __init__(self, parent, pos):
@@ -303,6 +318,7 @@ recMap = {
0xf008: OfficeArtFDG,
0xf009: OfficeArtFSPGR,
0xf00a: OfficeArtFSP,
+0xf011: OfficeArtClientData,
0xf11e: OfficeArtSplitMenuColorContainer,
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: test/doc
test/doc/test.py |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1a6b062634f57ea127163e3ba2f0b551bd03cefd
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 4 12:29:43 2012 +0100
doc tests: no more todo in test docs
diff --git a/test/doc/test.py b/test/doc/test.py
index 546c141..cbb866b 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -28,6 +28,8 @@ class Test(unittest.TestCase):
sock.close()
tree = ElementTree.parse('%s.doc.xml' % name)
self.root = tree.getroot()
+# Make sure everything is dumped - so it can't happen that dump(a) ==
dump(b), but a != b.
+self.assertEqual(0, len(self.root.findall('todo')))
def getFontId(self, name):
fonts =
self.root.findall('stream[@name=WordDocument]/fib/fibRgFcLcbBlob/lcbSttbfFfn/sttbfFfn/cchData')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2d655683dda815021011d9dd135a263f0003bed5 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Dec 4 12:32:10 2012 +0100 Typos Change-Id: I40aff76df4ddef3774632a3dcdf67b943229feb3 diff --git a/configure.ac b/configure.ac index ff95721..9af58c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1848,7 +1848,7 @@ AC_ARG_WITH(nss-build-tools, AS_HELP_STRING([--with-nss-build-tools], [For Windows users, please supply the path to the nss build tools.]) [ - Usage: --with-nss-build=absolute path to + Usage: --with-nss-build-tools=absolute path to nss build tools At the moment of this writing, an installer for the @@ -8038,7 +8038,7 @@ if test $_os != WINNT; then # new and shiny mork driver AC_MSG_RESULT([yes (new mork driver)]) else -if test WITH_MOZAB4WIN = NO; then +if test $WITH_MOZAB4WIN = NO; then AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes, internal (old windows mozab driver)]) @@ -8103,7 +8103,7 @@ else AC_MSG_CHECKING([for nss build tooling]) # coming from mozilla if test -z $NSSBUILDTOOLS; then AC_MSG_ERROR([nss build tooling not provided -Use the --with-nss-build option after installing the tools obtained +Use the --with-nss-build-tools option after installing the tools obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32]) else if test \( $WITH_MINGW = yes -a ! -d $NSSBUILDTOOLS \) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Dailies by banch?
Norbert Thiebaud píše v Po 03. 12. 2012 v 10:55 -0600: On Mon, Dec 3, 2012 at 6:21 AM, Petr Mladek pmla...@suse.cz wrote: Florian Effenberger píše v So 01. 12. 2012 v 13:29 +0100: Hello, Niko Rönkkö wrote on 2012-12-01 07:06: Can someone, please, sort dev-build dailies by branch? http://dev-builds.libreoffice.org/daily/ Michael M. said on IRC that that could be done with symlinks quite easily I guess So like: http://dev-builds.libreoffice.org/daily/libreoffice-3-6 http://dev-builds.libreoffice.org/daily/master I have just updated push_nightlies.sh script to upload to the above paths instead of the older ones, see http://cgit.freedesktop.org/libreoffice/contrib/buildbot/commit/?id=0d1a06acb76ac687229ccd666fba877527a3c722 I did not added compat symlinks because I wanted to keep it easy. I think that the new structure makes more sense and people will get used to it quickly. If someone would really miss the old structure, I could add the symlinks of course. I know that it might open discussion about even better solution. Well, IMHO, anything else would be much more complicated and it will not be that easy to find a volunteer to implement it. This was an easy win. :-) Fine with me... the only thing is to make sure that we sync all the tinderbox that push dailies at once (i.e that they all take the change in push_nightlies at once to avoid having a spread) I usually wait until the discussion come up to a conclusion. I did it faster this time because most people were in favour of the solution. We need to touch most tinderboxes because of 4-0 branch later today, so it is a great opportunity. I think that the transition path might take 1 or 2 days. It will be easy to find tinderboxes that upload wrongly. I will move the wrongly uploaded builds until all are fixed. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: salhelper/inc salhelper/Package_inc.mk sal/inc sal/Library_sal.mk sal/osl sal/Package_inc.mk sal/qa sal/util
sal/Library_sal.mk |2
sal/Package_inc.mk |2
sal/inc/osl/semaphor.h | 91 --
sal/inc/osl/semaphor.hxx | 120 ---
sal/osl/unx/semaphor.c | 126
sal/osl/unx/system.c | 69 ---
sal/osl/unx/system.h | 25
sal/osl/w32/pipe.c |1
sal/osl/w32/semaphor.c | 104
sal/qa/libs2test.txt |1
sal/qa/osl/condition/osl_Condition_Const.h |4
sal/util/sal.map |5
salhelper/Package_inc.mk |3
salhelper/inc/salhelper/future.hxx | 114 --
salhelper/inc/salhelper/futurequeue.hxx| 102
salhelper/inc/salhelper/queue.hxx | 178 -
16 files changed, 947 deletions(-)
New commits:
commit d911673a64250ece50f6ca5578385adabcae5e5d
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Dec 4 12:36:09 2012 +0100
API CHANGE: remove long-deprecated Semaphore related stuff.
osl::semaphore was not portable thusly long-deprecated. Also
killing further unused clients of that code in salhelper.
Change-Id: Ie1c1924e06e8ce3be33fd1dc2c6933f2de8b5217
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 9c835ed..72234a9 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -188,7 +188,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/profile \
sal/osl/unx/readwrite_helper \
sal/osl/unx/security \
- sal/osl/unx/semaphor \
sal/osl/unx/socket \
sal/osl/unx/system \
sal/osl/unx/tempfile \
@@ -258,7 +257,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/w32/nlsupport \
sal/osl/w32/pipe \
sal/osl/w32/security \
- sal/osl/w32/semaphor \
sal/osl/w32/thread \
sal/osl/w32/time \
sal/osl/w32/util \
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index bf17e5f..0e91e08 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -52,8 +52,6 @@ $(eval $(call
gb_Package_add_file,sal_inc,inc/osl/profile.hxx,osl/profile.hxx))
$(eval $(call
gb_Package_add_file,sal_inc,inc/osl/security_decl.hxx,osl/security_decl.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.h,osl/security.h))
$(eval $(call
gb_Package_add_file,sal_inc,inc/osl/security.hxx,osl/security.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/osl/semaphor.h,osl/semaphor.h))
-$(eval $(call
gb_Package_add_file,sal_inc,inc/osl/semaphor.hxx,osl/semaphor.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/signal.h,osl/signal.h))
$(eval $(call
gb_Package_add_file,sal_inc,inc/osl/socket_decl.hxx,osl/socket_decl.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.h,osl/socket.h))
diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h
deleted file mode 100644
index 9d46d7f..000
--- a/sal/inc/osl/semaphor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _OSL_SEMAPHORE_H_
-#define _OSL_SEMAPHORE_H_
-
-#include sal/config.h
-
-#include sal/saldllapi.h
-#include sal/types.h
-
-#ifdef __cplusplus
-extern C {
-#endif
-
-typedef void* oslSemaphore;
-
-/** Creates a semaphore.BR
-
-@deprecated
-Must not be used, as unnamed semaphores are not supported on Mac OS X.
-
-@param initialCount denotes the starting value the semaphore. If you set
it to
-zero, the first acquire() blocks. Otherwise InitialCount acquire()s are
-immedeatly successfull.
-@return 0 if the semaphore could not be created, otherwise a handle to the
sem.
-*/
-SAL_DLLPUBLIC oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32
initialCount);
-
-/** Release the OS-structures and free semaphore data-structure
-
-@deprecated
-Must not be used, as unnamed semaphores are not supported on Mac OS X.
-
-@return fbbb
-*/
-SAL_DLLPUBLIC void SAL_CALL
semaphore removal (was: Re: [Libreoffice] [PUSHED] Some OSL cleanup)
Michael Meeks wrote: One thing I noticed there was the under-usage of osl_sempahore and related bits. It might be worth checking the rest of the code to see if in fact we need this at all - the Condition stuff is much more widely used. If we find it is not / hardly ever used, we could use the generic: #ifdef NO_PTHREAD_SEMAPHORES implementation directly in-lined in the semaphore impl. and schedule Semaphore for ultimate removal in LibreOffice 4: semaphores went a few minutes ago, jointly with client code in salhelper (queue, futurequeue etc) Cheers, -- Thorsten pgprKsPeM6I4X.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/sdi sc/source sd/sdi sd/source sfx2/inc sfx2/sdi sfx2/source sw/sdi sw/source
sc/sdi/drawsh.sdi |1 +
sc/sdi/drtxtob.sdi |1 +
sc/sdi/formatsh.sdi |2 +-
sc/source/ui/view/formatsh.cxx |9 +++--
sd/sdi/_drvwsh.sdi |7 +++
sd/sdi/outlnvsh.sdi |7 +++
sd/source/ui/func/futempl.cxx |4 +++-
sd/source/ui/view/drviewsc.cxx |1 +
sd/source/ui/view/outlnvsh.cxx |3 +++
sfx2/inc/sfx2/sfxsids.hrc |1 +
sfx2/sdi/sfx.sdi| 25 +
sfx2/source/dialog/dialog.hrc |1 +
sfx2/source/dialog/dialog.src |7 ++-
sfx2/source/dialog/templdlg.cxx | 23 +++
sfx2/source/dialog/tplcitem.cxx |3 +++
sfx2/source/inc/templdgi.hxx|4
sw/sdi/_docsh.sdi |6 ++
sw/sdi/annotsh.sdi |6 ++
sw/source/ui/app/docst.cxx |4 +++-
19 files changed, 109 insertions(+), 6 deletions(-)
New commits:
commit 708447f2a5011ef76cb5ed6aa02bbac45e93a532
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Dec 4 10:31:35 2012 +0100
Styles Formatting: added Show menu item on hidden styles
The command to show hidden styles again was missing.
Change-Id: Ic25b0cfc4d021d949124b8c4ef4016d6dba7e39f
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 97c8cd7..ab2337f 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -49,6 +49,7 @@ interface TableDraw
SID_STYLE_EDIT [ StateMethod = StateDisableItems; Export =
FALSE; ]
SID_STYLE_DELETE[ StateMethod = StateDisableItems; Export =
FALSE; ]
SID_STYLE_HIDE [ StateMethod = StateDisableItems; Export =
FALSE; ]
+SID_STYLE_SHOW [ StateMethod = StateDisableItems; Export =
FALSE; ]
//
SID_TEXT_STANDARD [ ExecMethod = ExecDrawAttr; StateMethod =
NoState; Export = FALSE; ]
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index 11e38d4..0bb35fc 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -46,6 +46,7 @@ interface TableDrawText
SID_STYLE_EDIT [ StateMethod = StateDisableItems; Export =
FALSE; ]
SID_STYLE_DELETE[ StateMethod = StateDisableItems; Export =
FALSE; ]
SID_STYLE_HIDE [ StateMethod = StateDisableItems; Export =
FALSE; ]
+SID_STYLE_SHOW [ StateMethod = StateDisableItems; Export =
FALSE; ]
//
SID_CUT [ ExecMethod = Execute; StateMethod = GetState; Export
= FALSE; ]
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 3725917..13884ce 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -58,7 +58,7 @@ interface FormatForSelection
SID_STYLE_FAMILY4 [ ExecMethod = ExecuteStyle; StateMethod =
GetStyleState; ]
SID_STYLE_EDIT [ ExecMethod = ExecuteStyle; StateMethod =
GetStyleState; ]
SID_STYLE_DELETE[ ExecMethod = ExecuteStyle; StateMethod =
GetStyleState; ]
-SID_STYLE_HIDE[ ExecMethod = ExecuteStyle; StateMethod =
GetStyleState; ]
+SID_STYLE_SHOW [ ExecMethod = ExecuteStyle; StateMethod =
GetStyleState; ]
// } Slot's die in der DrawShell disabled werden.
SID_ATTR_ALIGN_HOR_JUSTIFY[ ExecMethod = ExecuteAlignment; StateMethod
= GetAttrState; ]
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 1a76135..4a53e6a 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -225,6 +225,7 @@ void ScFormatShell::GetStyleState( SfxItemSet rSet )
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
case SID_STYLE_HIDE:
+case SID_STYLE_SHOW:
{
ISfxTemplateCommon* pDesigner = SFX_APP()-
GetCurrentTemplateCommon(pTabViewShell-GetViewFrame()-GetBindings());
@@ -271,6 +272,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
|| (nSlotId == SID_STYLE_EDIT)
|| (nSlotId == SID_STYLE_DELETE)
|| (nSlotId == SID_STYLE_HIDE)
+|| (nSlotId == SID_STYLE_SHOW)
|| (nSlotId == SID_STYLE_APPLY)
|| (nSlotId == SID_STYLE_WATERCAN)
|| (nSlotId == SID_STYLE_FAMILY)
@@ -356,6 +358,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
case SID_STYLE_HIDE:
+case SID_STYLE_SHOW:
case SID_STYLE_NEW_BY_EXAMPLE:
{
const SfxPoolItem* pNameItem;
@@ -440,10 +443,11 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq )
break;
case SID_STYLE_HIDE:
+case SID_STYLE_SHOW:
{
if (
[PATCH] Few modifications in ui files
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1237 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/1237/1 Few modifications in ui files Change-Id: If7eb645994408b0f77bcd3e508c5c5c9865de821 --- M .git-hooks/commit-msg M sw/uiconfig/swriter/ui/bibliographyentry.ui M sw/uiconfig/swriter/ui/charurlpage.ui M sw/uiconfig/swriter/ui/columnwidth.ui M sw/uiconfig/swriter/ui/converttexttable.ui M sw/uiconfig/swriter/ui/endnotepage.ui M sw/uiconfig/swriter/ui/footnotepage.ui M sw/uiconfig/swriter/ui/indexentry.ui M sw/uiconfig/swriter/ui/insertbookmark.ui M sw/uiconfig/swriter/ui/insertbreak.ui M sw/uiconfig/swriter/ui/insertfootnote.ui M sw/uiconfig/swriter/ui/printeroptions.ui M sw/uiconfig/swriter/ui/sortdialog.ui M sw/uiconfig/swriter/ui/splittable.ui M sw/uiconfig/swriter/ui/stringinput.ui M sw/uiconfig/swriter/ui/titlepage.ui 16 files changed, 740 insertions(+), 378 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1237 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7eb645994408b0f77bcd3e508c5c5c9865de821 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] converstion of Printer setup widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1236 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/1236/1 converstion of Printer setup widget Change-Id: Id53e0e9b0e1ca92497bc994f6bd30ba191f9f5ef --- A sw/uiconfig/swriter/ui/printersetup.ui 1 file changed, 286 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1236 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id53e0e9b0e1ca92497bc994f6bd30ba191f9f5ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - Module_tail_build.mk sw/source tail_build/prj
Module_tail_build.mk|1 - sw/source/filter/ww8/ww8toolbar.cxx |3 ++- tail_build/prj/build.lst|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit ffd30f7bf1bd0df32dff0835a288d6bcc6361dd5 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Dec 4 05:56:34 2012 -0600 kick python3 out of tail_build for now to fix Mac build breakage Change-Id: I07fd96b7f956ea2c275f2112f403b9a29b3def8e diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 61fcc43..e0664bb 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -131,7 +131,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ padmin \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ psprint_config \ - $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ac96f9e..8090698 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL commit 18ea351e9a9c73add62a0469e707ff3457c084c8 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Dec 4 03:21:26 2012 -0600 WaE : call base copy constructor Change-Id: I6a31d51e8c20d2f8d8b2d14092e2ce84bf2aa95d diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 2d8f5c7..5d8c502 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -1309,7 +1309,8 @@ MCD::MCD() : reserved1(0x56) } MCD::MCD(const MCD rO) -: reserved1(rO.reserved1) +: TBBase(rO) +, reserved1(rO.reserved1) , reserved2(rO.reserved2) , ibst(rO.ibst) , ibstName(rO.ibstName) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/uiconfig
sw/uiconfig/swriter/ui/printersetup.ui | 286 + 1 file changed, 286 insertions(+) New commits: commit 141ddd5b872c1aa72bec1be2cd113ee97b9514a5 Author: gokul gswaminat...@kacst.edu.sa Date: Tue Dec 4 17:21:24 2012 +0530 converstion of Printer setup widget Change-Id: Id53e0e9b0e1ca92497bc994f6bd30ba191f9f5ef Reviewed-on: https://gerrit.libreoffice.org/1236 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sw/uiconfig/swriter/ui/printersetup.ui b/sw/uiconfig/swriter/ui/printersetup.ui new file mode 100644 index 000..5de5dad --- /dev/null +++ b/sw/uiconfig/swriter/ui/printersetup.ui @@ -0,0 +1,286 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkWindow id=window1 +property name=can_focusFalse/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing35/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkGrid id=grid2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=row_spacing15/property +property name=column_spacing20/property +child + object class=GtkGrid id=grid3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=column_spacing10/property +child + object class=GtkButton id=102 +property name=label translatable=yesProperties/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property + /object + packing +property name=left_attach1/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkComboBoxText id=comboboxtext1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=entry_text_column0/property +property name=id_column1/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child + /object + packing +property name=left_attach1/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkLabel id=2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesName/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object
[Libreoffice-commits] .: sw/uiconfig
sw/uiconfig/swriter/ui/numberformat.ui | 462 + 1 file changed, 462 insertions(+) New commits: commit 4feaf5a8a05016e596f78244b2e0b69e35205de9 Author: gokul gswaminat...@kacst.edu.sa Date: Tue Dec 4 13:35:47 2012 +0530 Added numberformat.ui and modified labels of present ui Change-Id: I1a58b92044a6db54cffbabc46e054c9638367000 Reviewed-on: https://gerrit.libreoffice.org/1234 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sw/uiconfig/swriter/ui/numberformat.ui b/sw/uiconfig/swriter/ui/numberformat.ui new file mode 100644 index 000..f07359c --- /dev/null +++ b/sw/uiconfig/swriter/ui/numberformat.ui @@ -0,0 +1,462 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkWindow id=Number Format +property name=can_focusFalse/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=spacing30/property +child + object class=GtkGrid id=grid2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=row_spacing10/property +property name=column_spacing10/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkGrid id=grid6 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=row_spacing2/property +child + object class=GtkGrid id=grid7 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=column_spacing7/property +child + object class=GtkEntry id=1003 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=invisible_charâ¢/property + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkButton id=add +property name=labelgtk-add/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=left_attach1/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkButton id=edit +property name=labelgtk-edit/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property
[PUSHED] Added numberformat.ui and modified labels of present ui
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1234 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1234 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a58b92044a6db54cffbabc46e054c9638367000 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] adding calc add-in for option pricing
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1232 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1232 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica4b621a7ae7e5ab447192ae3fe7b8911295bef2 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tino ttk...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk sd/source sfx2/source
RepositoryExternal.mk|2 ++
sd/source/ui/toolpanel/controls/MasterPageContainer.cxx |8 ++--
sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx |7 ---
sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx |5 +++--
sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx |6 ++
sfx2/source/appl/appopen.cxx |2 +-
6 files changed, 22 insertions(+), 8 deletions(-)
New commits:
commit 2a9c83fa8ac7e94d7124889e760c7343ccf3c19b
Author: Rob Snelders programm...@ertai.nl
Date: Sun Dec 2 15:25:56 2012 +0100
fdo#56877 CRASH when profile contains invalid RecentlyUsedMasterpages
Change-Id: Ia875d6b04b5ce6a026a57aaef2c17fc02a503ae9
Reviewed-on: https://gerrit.libreoffice.org/1224
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index f90dc2c..f17a224 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -1159,13 +1159,17 @@ bool
MasterPageContainer::Implementation::UpdateDescriptor (
// Update the page object (which may be used for the preview update).
if (bForcePageObject)
GetDocument();
-bool bPageObjectModified (rpDescriptor-UpdatePageObject(
+int bPageObjectModified (rpDescriptor-UpdatePageObject(
(bForcePageObject ? -1 : nCostThreshold),
mpDocument));
-if (bPageObjectModified bSendEvents)
+if (bPageObjectModified == 1 bSendEvents)
FireContainerChange(
MasterPageContainerChangeEvent::DATA_CHANGED,
rpDescriptor-maToken);
+if (bPageObjectModified == -1 bSendEvents)
+FireContainerChange(
+MasterPageContainerChangeEvent::CHILD_REMOVED,
+rpDescriptor-maToken);
if (bPageObjectModified ! mbFirstPageObjectSeen)
UpdatePreviewSizePixel();
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index 2601d27..fdd38c6 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -177,11 +177,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
-bool MasterPageDescriptor::UpdatePageObject (
+int MasterPageDescriptor::UpdatePageObject (
sal_Int32 nCostThreshold,
SdDrawDocument* pDocument)
{
-bool bModified (false);
+int bModified = 0;
// Update the page object when that is not yet known.
if (mpMasterPage == NULL
@@ -221,9 +221,10 @@ bool MasterPageDescriptor::UpdatePageObject (
else
{
DBG_ASSERT(false, UpdatePageObject: master page is NULL);
+return -1;
}
-bModified = true;
+bModified = 1;
}
return bModified;
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
index d77186a..0896a09 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
@@ -121,9 +121,10 @@ public:
a page object with or store one in.
@return
When the master page object is successfully provided then
-TRUE/ is returned.
+1 is returned, on no change then a 0 is provided,
+on a masterpage-error a -1 is provided.
*/
-bool UpdatePageObject (
+int UpdatePageObject (
sal_Int32 nCostThreshold,
SdDrawDocument* pDocument);
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 3951a37..512fd1d 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -432,6 +432,12 @@ void MasterPagesSelector::NotifyContainerChangeEvent
(const MasterPageContainerC
}
break;
+case MasterPageContainerChangeEvent::CHILD_REMOVED:
+{
+int nIndex (GetIndexForToken(rEvent.maChildToken));
+SetItem(nIndex, MasterPageContainer::NIL_TOKEN);
+}
+
default:
break;
}
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 6e11151..afddf87 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -397,7 +397,7 @@ sal_uIntPtr SfxApplication::LoadTemplate(
SfxObjectShellLock xDoc, const String
const SfxFilter* pFilter = NULL;
SfxMedium aMedium( rFileName, ( STREAM_READ | STREAM_SHARE_DENYNONE ) );
-if ( !aMedium.GetStorage( sal_True ).is() )
+if ( !aMedium.GetStorage( sal_False ).is() )
aMedium.GetInStream();
if ( aMedium.GetError() )
commit
[PUSHED] fdo#56877 CRASH when profile contains invalid RecentlyUsedMa...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1224 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1224 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia875d6b04b5ce6a026a57aaef2c17fc02a503ae9 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 52640, which changed state. Bug 52640 Summary: FORMATTING : tabstops malfunction in Draw and Impress https://bugs.freedesktop.org/show_bug.cgi?id=52640 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: distro-configs/LibreOfficeWin32.conf
distro-configs/LibreOfficeWin32.conf |2 ++ 1 file changed, 2 insertions(+) New commits: commit a8e00968ee2d14acc558bb700ca7da572fb6c44f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Dec 4 13:54:33 2012 +0100 Change some default config for Windows release build Change-Id: I9b028618212f5e2f9fe0f11181d97a9bfe06bf93 diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index b4529a6..19364be 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -13,3 +13,5 @@ --enable-ext-presenter-minimizer --enable-ext-nlpsolver --enable-online-update +--enable-win-mozab-driver +--disable-build-mozab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/InstallModule_ooo.mk scp2/source
scp2/InstallModule_ooo.mk|5 + scp2/source/ooo/file_library_ooo.scp |4 ++-- scp2/source/ooo/file_ooo.scp |2 +- 3 files changed, 4 insertions(+), 7 deletions(-) New commits: commit a75a79e32718f98bf1f84199c944a831bec75a6a Author: Stephan Bergmann sberg...@redhat.com Date: Tue Dec 4 13:57:53 2012 +0100 Adapt scp2 to WITH_MOZAB4WIN Change-Id: Ibef1ceb454eafba7129c774b8ced8c743ea3ce3d diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 23fbb67..13413a1 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -66,7 +66,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LIBXSLT \ SYSTEM_LPSOLVE \ SYSTEM_LUCENE \ - SYSTEM_MOZILLA \ SYSTEM_MYTHES \ SYSTEM_NEON \ SYSTEM_NSS \ @@ -77,6 +76,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_REDLAND \ SYSTEM_SNDFILE \ SYSTEM_STDLIBS \ + WITH_MOZAB4WIN \ )) $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ @@ -149,9 +149,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter YES,$(SYSTEM_HSQLDB)),\ -DHSQLDB_JAR=\$(call gb_Helper_make_path,$(HSQLDB_JAR))\ \ ) \ - $(if $(filter-out YES,$(WITH_MOZILLA)),\ - -DWITHOUT_MOZILLA \ - ) \ $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ -DWITHOUT_MYSPELL_DICTS \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6141f0e..8e94377 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -827,7 +827,7 @@ End #if defined(WNT) -#if !defined(SYSTEM_MOZILLA) !defined(WITHOUT_MOZILLA) +#if defined WITH_MOZAB4WIN STD_LIB_FILE(gid_File_Lib_Mozab,mozab2) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) @@ -1565,7 +1565,7 @@ File gid_File_Lib_Unopkgapp Styles = (PACKED); End -#if defined WNT !defined _gcc3 !defined SYSTEM_MOZILLA !defined WITHOUT_MOZILLA +#if defined WNT !defined _gcc3 defined WITH_MOZAB4WIN // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // gid_Brand_File_Lib_Msvcr80 File gid_File_Moz_Msvcp80 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 6b30e72..c4b48d1 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -610,7 +610,7 @@ File gid_File_Mod_Text Name = text.mod; End -#if !defined(SYSTEM_MOZILLA) !defined(WITHOUT_MOZILLA) +#if defined WITH_MOZAB4WIN File gid_File_Mozilla_Runtime TXT_FILE_BODY; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - avmedia/inc editeng/inc editeng/source svl/inc unotools/inc
avmedia/inc/avmedia/mediaitem.hxx |2 +-
editeng/inc/editeng/bolnitem.hxx |2 +-
editeng/inc/editeng/boxitem.hxx|4 ++--
editeng/inc/editeng/brshitem.hxx |2 +-
editeng/inc/editeng/bulitem.hxx|4 ++--
editeng/inc/editeng/colritem.hxx |2 +-
editeng/inc/editeng/cscoitem.hxx |2 +-
editeng/inc/editeng/escpitem.hxx |2 +-
editeng/inc/editeng/flditem.hxx|8
editeng/inc/editeng/fontitem.hxx |2 +-
editeng/inc/editeng/justifyitem.hxx|4 ++--
editeng/inc/editeng/lcolitem.hxx |2 +-
editeng/inc/editeng/lrspitem.hxx |2 +-
editeng/inc/editeng/numitem.hxx|8
editeng/inc/editeng/opaqitem.hxx |2 +-
editeng/inc/editeng/pbinitem.hxx |2 +-
editeng/inc/editeng/pmdlitem.hxx |2 +-
editeng/inc/editeng/prntitem.hxx |2 +-
editeng/inc/editeng/protitem.hxx |2 +-
editeng/inc/editeng/scripttypeitem.hxx |2 +-
editeng/inc/editeng/shaditem.hxx |2 +-
editeng/inc/editeng/sizeitem.hxx |2 +-
editeng/inc/editeng/tstpitem.hxx |4 ++--
editeng/inc/editeng/ulspitem.hxx |2 +-
editeng/source/editeng/editdoc.hxx |2 +-
editeng/source/editeng/impedit3.cxx|6 +++---
svl/inc/svl/aeitem.hxx |2 +-
svl/inc/svl/cenumitm.hxx |6 +++---
svl/inc/svl/eitem.hxx |4 ++--
svl/inc/svl/flagitem.hxx |2 +-
svl/inc/svl/hint.hxx |2 +-
svl/inc/svl/intitem.hxx| 10 +-
svl/inc/svl/macitem.hxx|2 +-
svl/inc/svl/metitem.hxx|2 +-
svl/inc/svl/poolitem.hxx |6 +++---
svl/inc/svl/srchitem.hxx |2 +-
svl/inc/svl/visitem.hxx|2 +-
unotools/inc/unotools/configitem.hxx |2 +-
38 files changed, 59 insertions(+), 59 deletions(-)
New commits:
commit 104a855ade9102d694293c1059f99946752f76d8
Author: David Tardon dtar...@redhat.com
Date: Tue Dec 4 13:48:00 2012 +0100
fdo#52640 fix right-aligned tabstops
It is no good to change temporary object...
Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index bdaeb9d..59e7ea1 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -407,7 +407,7 @@ public:
voidSetLen( sal_uInt16 nL ) { nLen = nL; }
Size GetSize() { return aOutSz; }
-SizeGetSize() const { return aOutSz; }
+const Size GetSize() const { return aOutSz; }
sal_uInt8 GetKind() { return nKind; }
sal_uInt8 GetKind() const { return nKind; }
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 1fbddb2..964579c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1149,7 +1149,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
nW = nMaxW;
aCurrentTab.bValid = sal_False;
}
-const TextPortion* pTabPortion =
pParaPortion-GetTextPortions()[aCurrentTab.nTabPortion];
+TextPortion* const pTabPortion =
pParaPortion-GetTextPortions()[aCurrentTab.nTabPortion];
pTabPortion-GetSize().Width() = aCurrentTab.nTabPos -
aCurrentTab.nStartPosX - nW - nStartX;
nTmpWidth = aCurrentTab.nStartPosX +
pTabPortion-GetSize().Width() + nWidthAfterTab;
}
@@ -1392,7 +1392,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
// Width from HangingPunctuation was set to 0 in ImpBreakLine,
// check for rel width now, maybe create compression...
long n = nMaxLineWidth - aTextSize.Width();
-const TextPortion* pTP =
pParaPortion-GetTextPortions()[pLine-GetEndPortion()];
+TextPortion* const pTP =
pParaPortion-GetTextPortions()[pLine-GetEndPortion()];
sal_uInt16 nPosInArray = pLine-GetEnd()-1-pLine-GetStart();
long nNewValue = ( nPosInArray ? pLine-GetCharPosArray()[
nPosInArray-1 ] : 0 ) + n;
pLine-GetCharPosArray()[ nPosInArray ] = nNewValue;
@@ -1934,7 +1934,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
if ( bCompressBlank || bHangingPunctuation )
{
-const TextPortion* pTP = pParaPortion-GetTextPortions()[nEndPortion];
+TextPortion* const pTP = pParaPortion-GetTextPortions()[nEndPortion];
DBG_ASSERT( pTP-GetKind() == PORTIONKIND_TEXT, BlankRubber: No
TextPortion! );
DBG_ASSERT( nBreakPos pLine-GetStart(), SplitTextPortion at the
beginning of the
Re: [PUSHED] adding calc add-in for option pricing
On 12/04/2012 01:23 PM, Fridrich Strba (via Code Review) wrote: Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1232 Approvals: Fridrich Strba: Verified; Looks good to me, approved Seeing this commit, I note that XPricingFunctions has method identifiers starting with a lower case letter and containing underscores. Such identifiers are reserved to the UNO implementation. (See http://www.openoffice.org/udk/common/man/typesystem.html. There is a -w resp. -we switch for idlc to generate warnings resp. errors in such cases, but that is not enabled in our build, because there were some historic violations IIRC.) Tino, can you adapt XPricingFunctions accordingly? Eike, my vague understaning of Calc Add-Ins is that they indeed need both a new UNO service and interface definition, right? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: icu/icu4c-mkdir.patch icu/makefile.mk
icu/icu4c-mkdir.patch | 10 ++ icu/makefile.mk |1 + 2 files changed, 11 insertions(+) New commits: commit 9d203cb549d59d4a641e445852e0879b3425654d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 4 14:34:22 2012 +0100 avoid build error (message) from icu The build actually finishes successfully (or maybe successfully) though. Change-Id: I1ecc7f6f77a087dce7f78ad9afdce15e1a2dffa9 diff --git a/icu/icu4c-mkdir.patch b/icu/icu4c-mkdir.patch new file mode 100644 index 000..89249ea --- /dev/null +++ b/icu/icu4c-mkdir.patch @@ -0,0 +1,10 @@ +--- misc/icu/source/dataMakefile.in.sav2012-04-05 22:49:20.0 +0200 misc/build/icu/source/data/Makefile.in 2012-12-04 14:24:40.548026700 +0100 +@@ -346,6 +346,7 @@ + ifeq ($(PKGDATA_MODE),dll) + SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res + $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc ++ mkdir -p $(OUTTMPDIR) + rc.exe /i$(srcdir)/../common /i$(top_builddir)/common /fo$@ $(CPPFLAGS) $(SOURCE_FILE) + endif + endif diff --git a/icu/makefile.mk b/icu/makefile.mk index 58b31e8..2d50a24 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -56,6 +56,7 @@ PATCH_FILES=\ icu4c.9313.cygwin.patch \ icu4c-macosx.patch \ icu4c-solarisgcc.patch \ +icu4c-mkdir.patch \ .IF $(OS)==ANDROID PATCH_FILES+=\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3.6] fdo#52640 right alignment of tabstop doesn't work
Hi all, commit 104a855ade9102d694293c1059f99946752f76d8 fixes $subj. It was caused by the 'const' in editeng/source/editeng/impedit3.cxx on line 1152. Because of that, a wrong overload of TextPortion::GetSize() was selected on the following line, so the width adjustment was made on a temporary Size object. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] adding calc add-in for option pricing
On 12/04/2012 02:52 PM, tino wrote: Seeing this commit, I note that XPricingFunctions has method identifiers starting with a lower case letter and containing underscores. Such identifiers are reserved to the UNO implementation. (See http://www.openoffice.org/udk/common/man/typesystem.html. There Sorry, UNO has been too complex for me to really understand. :) NP. And this naming restriction is really arcane, well-hidden stuff anyway. Do you mean function names like getOpt_barrier() or input variables as put_call or both? If it's the function names then would getOpt_barrier() -- getOptBarrier() be ok? Ah, right, some parameter names are affected, too. So yes, please replace all identifiers containing underscores with camel-case identifiers (where whether the latter are more or less beautiful than the former is an entirely unrelated topic... :) In general, UNOIDL identifiers for enum, constant group, typedef, struct, exception, interface, service, and singleton names, for struct and exception members, and for polymorphic struct type parameters are camel-case starting with uppercase (and interface names additionally starting with X); identifiers for modules, for interface attributes and methods, for service constructors, and for interface method and service constructor parameters are camel-case starting with lowercase; and identifiers for enum and constant group members are all-uppercase with underscores. (Where the latter is the reason why only identifiers starting with lowercase letters and containing underscores are reserved for UNO.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - officecfg/registry sfx2/uiconfig sw/inc sw/source
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |7 ++
sfx2/uiconfig/ui/checkin.ui |2
sw/inc/docstyle.hxx |1
sw/source/ui/app/docstyle.cxx| 29
+-
4 files changed, 24 insertions(+), 15 deletions(-)
New commits:
commit 03dc19955cbf3d302e9b7621f135f1e1bf949cca
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Dec 4 15:20:03 2012 +0100
Writer styles: add the non-hidden pooled styles if mask is SFXSTYLEBIT_ALL
Change-Id: I36054bf58f857b104abd83913d45f32f0c930c19
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 9c05f54..42d1b92 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -159,6 +159,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator,
public SfxListener
voidAppendStyleList(const boost::ptr_vectorString rLst,
sal_BoolbUsed,
sal_BoolbTestHidden,
+boolbOnlyHidden,
sal_uInt16 nSection,
charcType);
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index c2228dc..4a8458a 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2513,6 +2513,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
const sal_Bool bIsSearchUsed = SearchUsed();
bool bSearchHidden = ( nMask SFXSTYLEBIT_HIDDEN );
+bool bOnlyHidden = nMask == SFXSTYLEBIT_HIDDEN;
const sal_Bool bOrganizer =
((SwDocStyleSheetPool*)pBasePool)-IsOrganizerMode();
bool bAll = ( nSrchMask SFXSTYLEBIT_ALL_VISIBLE ) ==
SFXSTYLEBIT_ALL_VISIBLE;
@@ -2566,7 +2567,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
{
if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) )
AppendStyleList(SwStyleNameMapper::GetChrFmtUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR);
+bIsSearchUsed, bSearchHidden, bOnlyHidden,
+nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
cCHAR);
else
{
aLst.Append( cCHAR, SwStyleNameMapper::GetChrFmtUINameArray()[
@@ -2579,7 +2581,8 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
RES_POOLCHR_FOOTNOTE - RES_POOLCHR_BEGIN ] );
}
AppendStyleList(SwStyleNameMapper::GetHTMLChrFmtUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, cCHAR);
+bIsSearchUsed, bSearchHidden, bOnlyHidden,
+nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
cCHAR);
}
}
@@ -2682,19 +2685,19 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
bAll = ( nSMask SFXSTYLEBIT_ALL_VISIBLE ) == SFXSTYLEBIT_ALL_VISIBLE;
if ( bAll || (nSMask ~SFXSTYLEBIT_USED) == SWSTYLEBIT_TEXT )
AppendStyleList(SwStyleNameMapper::GetTextUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA );
+bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA );
if ( bAll || (nSMask ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CHAPTER )
AppendStyleList(SwStyleNameMapper::GetDocUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
+bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask ~SFXSTYLEBIT_USED) == SWSTYLEBIT_LIST )
AppendStyleList(SwStyleNameMapper::GetListsUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
+bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask ~SFXSTYLEBIT_USED) == SWSTYLEBIT_IDX )
AppendStyleList(SwStyleNameMapper::GetRegisterUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
+bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
if ( bAll || (nSMask ~SFXSTYLEBIT_USED) == SWSTYLEBIT_EXTRA )
AppendStyleList(SwStyleNameMapper::GetExtraUINameArray(),
-bIsSearchUsed, bSearchHidden,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, cPARA ) ;
+bIsSearchUsed,
Re: Styles preview removed ???
Hi Jean-Baptiste, Kendy, On Mon, 2012-12-03 at 10:16 +0100, Jan Holesovsky wrote: It must be a bug :-) It used to work; the style preview defaults to non-preview drawing when it (internally) does not find the style's attributes - I guess it might be connected to recent Cedric's changes that somehow caused that for the new document the attributes are not found, or something. Can you please file a bug for that? Thank you for careful testing, much appreciated! I just fixed it. I introduced some regression in the writer stylesheet iterator. All non-pooled styles were rendered properly... only the pooled styles were missing. Thanks a lot for the testing ;) -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/linectrl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 44ee3ce747058eaf7ca241fe482f4aab54c9bc92
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Dec 4 18:19:07 2012 +0400
fdo#40339: line style toolbar dropdown list not updated
... because XLineDashItem::GetName returns the so-called api name
(from RID_SVXSTR_DASH_DEF_START..RID_SVXSTR_DASH_DEF_END range), while
the listbox is filled with corresponding translated names.
Change-Id: I9ed6f6219f2b31fb02c24c70f3fef4f0efcb
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index d14e539..60f487e 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -33,6 +33,7 @@
#include svx/linectrl.hxx
#include svx/itemwin.hxx
#include svx/dialmgr.hxx
+#include svx/unoapi.hxx
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -157,7 +158,9 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem*
pState )
{
if( pDashItem )
{
-String aString( pDashItem-GetName() );
+String aString;
+SvxUnogetInternalNameForItem(
+XATTR_LINEDASH, pDashItem-GetName(), aString );
pBox-SelectEntry( aString );
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sd/sdi sd/source svx/inc svx/sdi
sd/sdi/_drvwsh.sdi |5 ++
sd/source/ui/app/popup2_tmpl.src |1
sd/source/ui/func/fuinsert.cxx |5 +-
sd/source/ui/inc/View.hxx|4 +
sd/source/ui/view/drviews8.cxx |1
sd/source/ui/view/sdview5.cxx| 90 ++-
svx/inc/globlmn_tmpl.hrc |5 ++
svx/inc/svx/svxids.hrc | 11 ++--
svx/sdi/svx.sdi | 24 ++
9 files changed, 102 insertions(+), 44 deletions(-)
New commits:
commit c349164824d7c4d467a7a9a9148a7cd6555e3684
Author: Radek Doulik r...@novell.com
Date: Tue Dec 4 15:58:21 2012 +0100
added Change picture menu item to graphic shape popup
Change-Id: I6e4927b847ca6990990be1075c8371404736e27e
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 5cbbefa..98f1539 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -61,6 +61,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_CHANGE_PICTURE
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_SAVE_GRAPHIC
[
ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index e3bcf7f..4fb9404 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -649,6 +649,7 @@
SEPARATOR
MN_STYLEDT
SEPARATOR
+MenuItem { ITEM_CHANGE_PICTURE };
MenuItem { ITEM_SAVE_GRAPHIC };
MenuItem { ITEM_COMPRESS_GRAPHIC };
MenuItem { ITEM_EXTERNAL_EDIT };
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 227a18f..ab297b7 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -153,6 +153,7 @@ void DrawViewShell::FuTemp01(SfxRequest rReq)
}
break;
+case SID_CHANGE_PICTURE:
case SID_INSERT_GRAPHIC:
{
SetCurrentFunction( FuInsertGraphic::Create( this,
GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 35a465e..9441328 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -264,6 +264,11 @@
Command = .uno:SaveGraphic ; \
Text [ en-US ] = Save Graphic... ; \
+#define ITEM_CHANGE_PICTURE \
+Identifier = SID_CHANGE_PICTURE ; \
+Command = .uno:ChangePicture ; \
+Text [ en-US ] = Change Picture... ; \
+
#define ITEM_VIEW_ATTR_ZOOM \
Identifier = SID_ATTR_ZOOM ; \
Command = .uno:Zoom ; \
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 8d6e56f..2f06246 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -922,11 +922,12 @@
#define SID_INSERT_FORM_HSCROLL (SID_SVX_START+1112)
#define SID_EXTERNAL_EDIT (SID_SVX_START+1113)
#define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114)
-#define SID_SAVE_GRAPHIC(SID_SVX_START+1115)
-#define SID_COMPRESS_GRAPHIC(SID_SVX_START+1116)
-#define SID_FRAME_UP(SID_SVX_START+1117)
-#define SID_FRAME_DOWN (SID_SVX_START+1118)
-#define SID_ATTR_SPECIALCHAR(SID_SVX_START+1119)
+#define SID_CHANGE_PICTURE (SID_SVX_START+1125)
+#define SID_SAVE_GRAPHIC(SID_SVX_START+1116)
+#define SID_COMPRESS_GRAPHIC(SID_SVX_START+1117)
+#define SID_FRAME_UP(SID_SVX_START+1118)
+#define SID_FRAME_DOWN (SID_SVX_START+1119)
+#define SID_ATTR_SPECIALCHAR(SID_SVX_START+1120)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
#define SID_SVX_FIRSTFREE (SID_COMPRESS_GRAPHIC
+ 1)
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 7fa4600..a0b4f85 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5913,6 +5913,30 @@ SfxVoidItem ExternalEdit SID_EXTERNAL_EDIT
GroupId = GID_GRAPHIC;
]
+SfxVoidItem ChangePicture SID_CHANGE_PICTURE
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_GRAPHIC;
+]
+
SfxVoidItem SaveGraphic SID_SAVE_GRAPHIC
()
[
commit 869031d702639852cac51cdb8306ff31420b3f3f
Author: Radek Doulik r...@novell.com
Date: Tue Dec 4 15:56:38 2012 +0100
changed behavior of insert picture
- when single graphic object shape is selected,
[Libreoffice-commits] .: sal/inc
sal/inc/rtl/strbuf.hxx |2 +-
sal/inc/rtl/string.hxx |2 +-
sal/inc/rtl/stringconcat.hxx | 12 +---
sal/inc/rtl/ustrbuf.hxx |2 +-
sal/inc/rtl/ustring.hxx |4 ++--
5 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit bda7beac5b9ea434ddd3185e71d253c9ba11c098
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 4 15:55:14 2012 +0100
sal: warning C4267: return: conversion from 'size_t' to 'int'...
... possible loss of data.
Minimal fix that inserts casts when calling strlen; other option would
be to change all length() to return size_t...
Change-Id: I5d1e0b0c7175a1957aad3acd89884fcd37089454
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 5f1c351..ed627ce 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -228,7 +228,7 @@ public:
template typename T1, typename T2
OStringBuffer( const OStringConcat T1, T2 c )
{
-const int l = c.length();
+const sal_Int32 l = c.length();
rtl_String* buffer = NULL;
nCapacity = l + 16;
rtl_string_new_WithLength( buffer, nCapacity );
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index f1e51b7..cbd4b9a 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -260,7 +260,7 @@ public:
template typename T1, typename T2
OString( const OStringConcat T1, T2 c )
{
-const int l = c.length();
+const sal_Int32 l = c.length();
rtl_String* buffer = NULL;
rtl_string_new_WithLength( buffer, l );
if (l != 0)
diff --git a/sal/inc/rtl/stringconcat.hxx b/sal/inc/rtl/stringconcat.hxx
index bf0244a..2b4fc31 100644
--- a/sal/inc/rtl/stringconcat.hxx
+++ b/sal/inc/rtl/stringconcat.hxx
@@ -100,7 +100,9 @@ sal_Unicode* addDataUString( sal_Unicode* buffer, const
sal_Unicode* str )
template
struct ToStringHelper const char*
{
-static int length( const char* str ) { return strlen( str ); }
+static int length( const char* str ) {
+return sal::static_int_castint(strlen( str ));
+}
static char* addData( char* buffer, const char* str ) { return
addDataCString( buffer, str ); }
static const bool allowOStringConcat = true;
static const bool allowOUStringConcat = false;
@@ -109,7 +111,9 @@ struct ToStringHelper const char*
template
struct ToStringHelper char*
{
-static int length( const char* str ) { return strlen( str ); }
+static int length( const char* str ) {
+return sal::static_int_castint(strlen( str ));
+}
static char* addData( char* buffer, const char* str ) { return
addDataCString( buffer, str ); }
static const bool allowOStringConcat = true;
static const bool allowOUStringConcat = false;
@@ -118,7 +122,9 @@ struct ToStringHelper char*
template int N
struct ToStringHelper char[ N ]
{
-static int length( const char str[ N ] ) { return strlen( str ); }
+static int length( const char str[ N ] ) {
+return sal::static_int_castint(strlen( str ));
+}
static char* addData( char* buffer, const char str[ N ] ) { return
addDataCString( buffer, str ); }
static sal_Unicode* addData( sal_Unicode* buffer, const char str[ N ] ) {
return addDataLiteral( buffer, str, N - 1 ); }
static const bool allowOStringConcat = true;
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index f49f7f8..b8f2d05 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -220,7 +220,7 @@ public:
template typename T1, typename T2
OUStringBuffer( const OUStringConcat T1, T2 c )
{
-const int l = c.length();
+const sal_Int32 l = c.length();
rtl_uString* buffer = NULL;
nCapacity = l + 16;
rtl_uString_new_WithLength( buffer, nCapacity ); // TODO this clears,
not necessary
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 4408dfd..3629511 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -328,7 +328,7 @@ public:
template typename T1, typename T2
OUString( const OUStringConcat T1, T2 c )
{
-const int l = c.length();
+const sal_Int32 l = c.length();
rtl_uString* buffer = NULL;
rtl_uString_new_WithLength( buffer, l ); // TODO this clears, not
necessary
if (l != 0)
@@ -1592,7 +1592,7 @@ public:
@since LibreOffice 4.0
*/
-OUString replaceAll(OUString const from, OUString const to, int
fromIndex = 0) const {
+OUString replaceAll(OUString const from, OUString const to, sal_Int32
fromIndex = 0) const {
rtl_uString * s = 0;
rtl_uString_newReplaceAllFromIndex(s, pData, from.pData, to.pData,
fromIndex);
return OUString(s, SAL_NO_ACQUIRE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] .: scp2/InstallModule_ooo.mk
scp2/InstallModule_ooo.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 19107879c793cb5f933f07edee5f5d8f8e80816d Author: Petr Mladek pmla...@suse.cz Date: Tue Dec 4 16:02:32 2012 +0100 package moz stuff only when WITH_MOZAB4WIN == YES Change-Id: I2228d246e6d94f27d18d597c3833578592487b94 diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 13413a1..95ea166 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -76,7 +76,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_REDLAND \ SYSTEM_SNDFILE \ SYSTEM_STDLIBS \ - WITH_MOZAB4WIN \ )) $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ @@ -149,6 +148,9 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter YES,$(SYSTEM_HSQLDB)),\ -DHSQLDB_JAR=\$(call gb_Helper_make_path,$(HSQLDB_JAR))\ \ ) \ + $(if $(filter YES,$(WITH_MOZAB4WIN)),\ + -DWITH_MOZAB4WIN \ + ) \ $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ -DWITHOUT_MYSPELL_DICTS \ ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] adding calc add-in for option pricing
On 12/04/2012 04:01 PM, tino wrote: Do you mean function names like getOpt_barrier() or input variables as put_call or both? If it's the function names then would getOpt_barrier() -- getOptBarrier() be ok? Ah, right, some parameter names are affected, too. So yes, please replace all identifiers containing underscores with camel-case identifiers (where whether the latter are more or less beautiful than the former is an entirely unrelated topic... :) Just to be clear, are we only talking about XPricingFunctions.idl as far as the variable names are concerned? Obviously, for the function names I have to change them in a few places but variables is probably optional? Would you still recommend to change them everywhere or just in the idl file? Changing the parameter names only in the .idl file, and not also in any implementation .hxx/.cxx files, is just fine. (Though it generally does not hurt to use the same names in the implementation as in the .idl file, but that's just style.) Do I also have to change the function name exported to the cell, e.g. OPT_BARRIER()? No, that is apparently something unrelated to UNO. In general, UNOIDL identifiers for enum, constant group, typedef, struct, exception, interface, service, and singleton names, for struct and exception members, and for polymorphic struct type parameters are camel-case starting with uppercase (and interface names additionally starting with X); identifiers for modules, for interface attributes and methods, for service constructors, and for interface method and service constructor parameters are camel-case starting with lowercase; and identifiers for enum and constant group members are all-uppercase with underscores. (Where the latter is the reason why only identifiers starting with lowercase letters and containing underscores are reserved for UNO.) Wow this is tough for my brain :) so from what you've seen anything else I should change? No, the above was the only thing that caught my eye. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] adding calc add-in for option pricing
Hi,
On Tuesday, 2012-12-04 14:32:36 +0100, Stephan Bergmann wrote:
Eike, my vague understaning of Calc Add-Ins is that they indeed need
both a new UNO service and interface definition, right?
Yes, the
scaddins/idl/com/sun/star/sheet/addin/{PricingFunctions.idl,XPricingFunctions.idl}
are fine, aren't they?
@Tino:
Note that the no-underscore restriction and camelCase instead is only
for the UNO interface, the UI names of the functions are not affected by
that.
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
pgpK62WViFLIK.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - cui/source officecfg/registry vcl/inc
cui/source/options/personalization.cxx | 189 ++---
cui/source/options/personalization.hxx | 10
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 62
vcl/inc/vcl/msgbox.hxx |4
4 files changed, 230 insertions(+), 35 deletions(-)
New commits:
commit ad0e96c2ec27ed6266715c724464809e6d86979f
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 4 08:49:50 2012 +0100
Personas: Allow to paste Persona to the selection dialog.
Change-Id: Ife095eb27fac135c0c2285259dd1008e9b7cefc5
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 3f0330a..4fe2b1b 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -11,6 +11,7 @@
#include comphelper/processfactory.hxx
#include officecfg/Office/Common.hxx
+#include vcl/edit.hxx
#include vcl/msgbox.hxx
#include com/sun/star/lang/XMultiServiceFactory.hpp
@@ -31,9 +32,15 @@ http://www.getpersona.com ...
*/
class SelectPersonaDialog : public ModalDialog
{
+private:
+Edit *m_pEdit; /// The input line for the
Persona URL
+
public:
SelectPersonaDialog( Window *pParent );
+/// Get the URL from the Edit field.
+OUString GetPersonaURL() const;
+
private:
/// Handle the [Visit Firefox Personas] button
DECL_LINK( VisitPersonas, PushButton* );
@@ -45,6 +52,19 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
PushButton *pButton;
get( pButton, visit_personas );
pButton-SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
+
+get( m_pEdit, persona_url );
+m_pEdit-SetPlaceholderText( http://www.getpersonas.com/persona/; );
+}
+
+OUString SelectPersonaDialog::GetPersonaURL() const
+{
+OUString aText( m_pEdit-GetText() );
+
+if ( !aText.startsWith( http://www.getpersonas.com/; ) )
+return OUString();
+
+return aText;
}
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
@@ -198,10 +218,16 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectPersona,
PushButton*, /*pButton*/ )
{
SelectPersonaDialog aDialog( NULL );
-if ( aDialog.Execute() == RET_OK )
+while ( aDialog.Execute() == RET_OK )
{
-m_pOwnPersona-Check();
-// TODO parse the results
+OUString aURL( aDialog.GetPersonaURL() );
+if ( aURL != )
+{
+// TODO parse the results
+m_pOwnPersona-Check();
+break;
+}
+// else TODO msgbox that the URL did not match
}
return 0;
commit 23c3f4a72cfbcc59d39be7b9832ef6439f440d29
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 4 00:33:12 2012 +0100
Personas: Make the [Visit Firefox Personas] button work.
Change-Id: I024bcd527b643076642a233d8e71003c006b5c15
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 25cc8d0..3f0330a 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -14,6 +14,8 @@
#include vcl/msgbox.hxx
#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/system/SystemShellExecute.hpp
+#include com/sun/star/system/SystemShellExecuteFlags.hpp
#include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
#include com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp
#include com/sun/star/ui/dialogs/XFilePicker.hpp
@@ -31,11 +33,27 @@ class SelectPersonaDialog : public ModalDialog
{
public:
SelectPersonaDialog( Window *pParent );
+
+private:
+/// Handle the [Visit Firefox Personas] button
+DECL_LINK( VisitPersonas, PushButton* );
};
SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
: ModalDialog( pParent, SelectPersonaDialog,
cui/ui/select_persona_dialog.ui )
{
+PushButton *pButton;
+get( pButton, visit_personas );
+pButton-SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
+}
+
+IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
+{
+uno::Reference system::XSystemShellExecute xSystemShell(
system::SystemShellExecute::create( ::comphelper::getProcessComponentContext()
) );
+
+xSystemShell-execute( http://www.getpersonas.com;, OUString(),
system::SystemShellExecuteFlags::URIS_ONLY );
+
+return 0;
}
SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const
SfxItemSet rSet )
commit 03f04a9ee298ad968d00910f0f96a0a834ec7cda
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 4 00:16:18 2012 +0100
Personas: File dialog for the selection of the background image.
Change-Id: Iafb5c62f310a6fd1658a7fa80346fa3510fc38e7
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 1bfe549..25cc8d0 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -13,6
Re: [PUSHED] adding calc add-in for option pricing
On 12/04/2012 04:21 PM, Eike Rathke wrote:
On Tuesday, 2012-12-04 14:32:36 +0100, Stephan Bergmann wrote:
Eike, my vague understaning of Calc Add-Ins is that they indeed need
both a new UNO service and interface definition, right?
Yes, the
scaddins/idl/com/sun/star/sheet/addin/{PricingFunctions.idl,XPricingFunctions.idl}
are fine, aren't they?
Nothing bad there apart from the somewhat useless declaration of an
(old-style) service that is never explicitly called anyway, but which is
required by the somewhat unfortunate design of that Add-In mechanism AFAIU.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - Makefile.top Module_tail_build.mk solenv/gbuild
Makefile.top|4 ++-- Module_tail_build.mk|6 +++--- solenv/gbuild/gbuild.mk |9 + 3 files changed, 14 insertions(+), 5 deletions(-) New commits: commit 3b9483e397c91902a3d7ccc8fbc551ff335ff65c Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Dec 4 16:36:59 2012 +0100 make 'make tail_build' work again from the toplevel also: - tail_build.all - tail_build.build - tail_build.check diff --git a/Makefile.top b/Makefile.top index a5f73ae..4f445cb 100644 --- a/Makefile.top +++ b/Makefile.top @@ -29,7 +29,7 @@ endif # by the module being mentioned in packimages/prj/build.lst, etc, recursively. $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(SRCDIR)/config_host.mk mkdir -p $(dir $@) - echo -n gbuild_modules:= $@ + echo -n gbuild_modules:= tail_build \\ $@ for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@ echo $@ echo -n dmake_modules:= $@ @@ -49,7 +49,7 @@ $(1): bootstrap fetch cd $(1) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T $(1).all: bootstrap fetch - $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ + $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) tail_build), \ cd tail_build unset MAKEFLAGS \ export gb_TAILBUILDTARGET=$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) \ , \ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index e0664bb..58eb4f5 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -22,9 +22,9 @@ # instead of those above. -$(eval $(call gb_Module_Module,tail_end)) +$(eval $(call gb_Module_Module,tail_build)) -$(eval $(call gb_Module_add_moduledirs,tail_end,\ +$(eval $(call gb_Module_add_moduledirs,tail_build,\ accessibility \ $(call gb_Helper_optional,AFMS,afms) \ animations \ @@ -205,7 +205,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ )) ifeq ($(MERGELIBS),TRUE) -$(eval $(call gb_Module_add_targets,tail_end,\ +$(eval $(call gb_Module_add_targets,tail_build,\ Library_merged \ )) endif commit 878ecbaf8985be0517fdbb2785b3864fbc9afcf6 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Dec 4 15:21:00 2012 +0100 revert the huge performance regression in gbuild intoduced with 0a45deba2be4a77db7540bd050b25bd6c26d7513 - we should default to make -r - everything else grows exponentially with the number of targets - gbuild should now have sane noop builds again even on make 3.82 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d0440b4..6f3a99c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -48,10 +48,19 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild .DELETE_ON_ERROR: +# do not use built-in rules +# DO NOT TOUCH THIS LINE UNLESS YOU REALLY KNOW WHAT YOU ARE DOING +# REMOVING THIS MAKES e.g. MODULE SW ALONE SLOWER BY SOME 300% +# FOR TAIL_BUILD THE IMPACT IS HUGE! +# (unless you are doing make -r, which we should explicitly NOT require from +# users) +MAKEFLAGS+=-r + # by default gbuild use /bin/sh # if you want to use a particular shell # you can export gb_SHELL=path_to_shell # + ifdef gb_SHELL SHELL := $(gb_SHELL) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] adding calc add-in for option pricing
On Tue, 2012-12-04 at 15:01 +, tino wrote: Do I also have to change the function name exported to the cell, e.g. OPT_BARRIER()? My concern here would be that potentially calc function naming is not always a great match to UNO constraints - and yet those functions are defined as IDL. Some functions have '.'s in them IIRC, others might want to have _'s (?) and translating functions is prolly not feasible via the UNO interface. It's not clear to me that scaddins/ (beyond providing a nice test / example for how to implement UNO functions as extensions - which is good), is going to cut it long term. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'libreoffice-4-0'
New branch 'libreoffice-4-0' available with the following commits: commit 2b37950864e3257acab0c589afcd13fee2a3a441 Author: Petr Mladek pmla...@suse.cz Date: Tue Dec 4 16:59:35 2012 +0100 Branch libreoffice-4-0 This is 'libreoffice-4-0' - the stable branch for the 4.0.x releases. The commit rules are different according to the development phase: + 4.0.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.0.0 rc phase and later: + fixes need approval by one reviewer + late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0'
New branch 'libreoffice-4-0' available with the following commits: commit c027908b132959a84e2a51c5631a42324985707d Author: Petr Mladek pmla...@suse.cz Date: Tue Dec 4 16:59:36 2012 +0100 Branch libreoffice-4-0 This is 'libreoffice-4-0' - the stable branch for the 4.0.x releases. The commit rules are different according to the development phase: + 4.0.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.0.0 rc phase and later: + fixes need approval by one reviewer + late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0'
New branch 'libreoffice-4-0' available with the following commits: commit 143cc3e26740ddd004c0e89733cb91d17de326bc Author: Petr Mladek pmla...@suse.cz Date: Tue Dec 4 16:59:36 2012 +0100 Branch libreoffice-4-0 This is 'libreoffice-4-0' - the stable branch for the 4.0.x releases. The commit rules are different according to the development phase: + 4.0.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.0.0 rc phase and later: + fixes need approval by one reviewer + late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac instsetoo_native/util solenv/inc
configure.ac |2
instsetoo_native/util/openoffice.lst | 92 +--
solenv/inc/minor.mk |6 +-
solenv/inc/productversion.mk |2
4 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit 0178ef0039a10a9d2adfe081845ac2e6e8e0ef05
Author: Petr Mladek pmla...@suse.cz
Date: Tue Dec 4 17:17:11 2012 +0100
bump product version to 4.1.0.0.alpha0+, build id to 0
Change-Id: I0a8e86dc862b05e8c92738a565ae1513ea9e60b0
diff --git a/configure.ac b/configure.ac
index 9af58c7..bb7575f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil;
fill-column: 102 -*
dnl configure.ac serves as input for the GNU autoconf package
dnl in order to create a configure script.
-AC_INIT([LibreOffice],[4.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 2f1ccf8..487f460 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.0.0.alpha1
+UREPACKAGEVERSION 4.1.0.0.alpha0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
-UNIXBASISROOTNAME libreoffice4.0
-SERVICETAG_PRODUCTNAME LibreOffice 4.0
-SERVICETAG_PRODUCTVERSION 4.0
-SERVICETAG_PARENTNAME LibreOffice 4.0
+UNIXBASISROOTNAME libreoffice4.1
+SERVICETAG_PRODUCTNAME LibreOffice 4.1
+SERVICETAG_PRODUCTVERSION 4.1
+SERVICETAG_PARENTNAME LibreOffice 4.1
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
@@ -47,17 +47,17 @@ LibreOffice
variables
{
PRODUCTNAME LibreOffice
-PRODUCTVERSION 4.0
+PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.alpha0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 4.0
+BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 4.0
+BASEPRODUCTVERSION 4.1
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
variables
{
PRODUCTNAME LOdev
-PRODUCTVERSION 4.0
+PRODUCTVERSION 4.1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
-UNIXBASISROOTNAME lodev4.0
+SHORT_PRODUCTEXTENSION .0.0.alpha0
+UNIXBASISROOTNAME lodev4.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 4.0
+BRANDPACKAGEVERSION 4.1
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ABOUTBOXPRODUCTVERSION 4.1.0.0.alpha0
ABOUTBOXPRODUCTVERSIONSUFFIX +
-BASEPRODUCTVERSION 4.0
+BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,13 +160,13 @@ URE
variables
{
PRODUCTNAME URE
-PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.0.0.alpha1
+PRODUCTVERSION 4.1
+PACKAGEVERSION 4.1.0.0.alpha0
PACKAGEREVISION 1
PRODUCTEXTENSION
-BRANDPACKAGEVERSION 4.0
+BRANDPACKAGEVERSION 4.1
LONG_PRODUCTEXTENSION
-
[Libreoffice-commits] .: solenv/inc
solenv/inc/minor.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 62b9b25da8b182d0bdba99f70d6123dc2666e382 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 4 16:25:14 2012 + bump minor.mk to 410 otherwise build dies with solenv/inc/settings.mk: line 50 Error: -- Expecting macro or rule defn, found neither with a SOURCEVERSION of OOO400 in minor.mk and a WORK_STAMP of OOO410 in config_host.mk Change-Id: I79cd39285c43e21c791dc5c8565ad58003553ad9 diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index af25dbc..36f5986 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,8 +1,8 @@ -RSCVERSION=400 -RSCREVISION=400m1(Build:0) +RSCVERSION=410 +RSCREVISION=410m1(Build:0) BUILD=0 LAST_MINOR=m0 -SOURCEVERSION=OOO400 +SOURCEVERSION=OOO410 VERSIONMAJOR=4 VERSIONMINOR=1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - editeng/source
editeng/source/editeng/editdoc.hxx |2 +-
editeng/source/editeng/impedit3.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 032d1d3cf5f69c28a39ba7e8a62eb580e545a0d5
Author: David Tardon dtar...@redhat.com
Date: Tue Dec 4 13:48:00 2012 +0100
fdo#52640 fix right-aligned tabstops
It is no good to change temporary object...
Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index d952e6a..77f1d49 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -417,7 +417,7 @@ public:
voidSetLen( sal_uInt16 nL ) { nLen = nL; }
Size GetSize() { return aOutSz; }
-SizeGetSize() const { return aOutSz; }
+const Size GetSize() const { return aOutSz; }
sal_uInt8 GetKind() { return nKind; }
sal_uInt8 GetKind() const { return nKind; }
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 59c70bf..9f1a955 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1157,7 +1157,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
nW = nMaxW;
aCurrentTab.bValid = sal_False;
}
-const TextPortion* pTabPortion =
pParaPortion-GetTextPortions()[aCurrentTab.nTabPortion];
+TextPortion* const pTabPortion =
pParaPortion-GetTextPortions()[aCurrentTab.nTabPortion];
pTabPortion-GetSize().Width() = aCurrentTab.nTabPos -
aCurrentTab.nStartPosX - nW - nStartX;
nTmpWidth = aCurrentTab.nStartPosX +
pTabPortion-GetSize().Width() + nWidthAfterTab;
}
@@ -1400,7 +1400,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
// Width from HangingPunctuation was set to 0 in ImpBreakLine,
// check for rel width now, maybe create compression...
long n = nMaxLineWidth - aTextSize.Width();
-const TextPortion* pTP =
pParaPortion-GetTextPortions()[pLine-GetEndPortion()];
+TextPortion* const pTP =
pParaPortion-GetTextPortions()[pLine-GetEndPortion()];
sal_uInt16 nPosInArray = pLine-GetEnd()-1-pLine-GetStart();
long nNewValue = ( nPosInArray ? pLine-GetCharPosArray()[
nPosInArray-1 ] : 0 ) + n;
pLine-GetCharPosArray()[ nPosInArray ] = nNewValue;
@@ -1942,7 +1942,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion*
pParaPortion, EditLine* pLine, Te
if ( bCompressBlank || bHangingPunctuation )
{
-const TextPortion* pTP = pParaPortion-GetTextPortions()[nEndPortion];
+TextPortion* const pTP = pParaPortion-GetTextPortions()[nEndPortion];
DBG_ASSERT( pTP-GetKind() == PORTIONKIND_TEXT, BlankRubber: No
TextPortion! );
DBG_ASSERT( nBreakPos pLine-GetStart(), SplitTextPortion at the
beginning of the line? );
sal_uInt16 nPosInArray = nBreakPos - 1 - pLine-GetStart();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3.6][PUSHED 3-6] fdo#52640 right alignment of tabstop doesn't work
On 12/04/2012 08:47 AM, David Tardon wrote: Hi all, commit 104a855ade9102d694293c1059f99946752f76d8 fixes $subj. It was caused by the 'const' in editeng/source/editeng/impedit3.cxx on line 1152. Because of that, a wrong overload of TextPortion::GetSize() was selected on the following line, so the width adjustment was made on a temporary Size object. Yup. It was an obvious mistake that I probably made during edit engine rework. Thanks a lot for picking this up! Pushed to 3-6 with my sign-off. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4-0-branch-point'
Tag 'libreoffice-4-0-branch-point' created by Petr Mladek pmla...@suse.cz at 2012-12-04 16:37 -0800 Tag libreoffice-4-0-branch-point -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQvia3AAoJEPQ0oe+v7q6jn2cQAMk6eO50+wSkwsSRV2WxloAK iBaS73aog72VEYF0eglRjROLUwE9VneTgEqGJFqhWE3Ojk8BL+Cpzr7Ic1IqLLQ3 QoKo0rAclPkNybrABfhz0DXLU2hfpGnPBli0p8pVUS0b1RH/Z0EXK6AZ3DgXsslF NOTELnFiXk3e/LMCFU5SUuOWItVpMW+OQ69PQghDuOufK9x7jS8Ib8eD6hqBKDx5 rzUO2Qb+UykEXiSEIsVxmF4ZzSlvftwSukn66iH8ntsI1TMBS+WluWwWCD2lcB4+ U3WfpUPKdqKfOptVr2UiY074JNfqVob/66ejWvasbESYlzq+F5rLQQMJx7Xl19c6 41XA++2XS7c5Xm+bErY1eBDQsNS2qOM+sIxief9VcDipfkxvN03L8UA1qIv8Ojno ZITIxsANqEUx77+2Pseug0Mu4T98tutGVyFl3BtcLmy5rShMFsRoh0g1S9INRCwH VR9Lh6jsguBYt/y4rIrrs1i6lY6uKJRbvtmODHMyslElWOrz00oBlT3sUmmUW78k PPG062XEs87lDw/dfgV+M3Ojx9oDkx0UcMyh/k5o/Nck7nxy0PTS8fqN/L2mRyya 9SSq+xW3e41Ct739feFQHXlxD8WC4rqAQtKVgD280gbrrqHiVyWa/ZKy6KXfQLV/ jBe06WfV9aHHPHBD1VSO =YsG/ -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-42: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4-0-branch-point'
Tag 'libreoffice-4-0-branch-point' created by Petr Mladek pmla...@suse.cz at 2012-12-04 16:36 -0800 Tag libreoffice-4-0-branch-point -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQvialAAoJEPQ0oe+v7q6jH8MP/RjMrJdhOJZJQmHGhgAxFvd1 AEQ3R7FyLfa0OhXHbDukywG4gtHlEo/7wH9Cwhh4oc9QjgOi/cV/8QVyehHLoF58 Bt+OeyTPUXJm43rqImCrTrCdHSij+OPihjzO2CeZp543ZkOGW7DxzPIbK1uXgTFi BLs6gjf1vGH3BW+vWPFXiSPnHE7BJdNmLwWENENiS7hj/UjeqAUwXNUnkHHNHhJN ITzRCAz//f580QCKyYWZNwmApi0Tg8Hi9aRcdP7n0ViAixg4asEI4DXHL83HzaWO Sb4iiifck2XYU6B9zeEaqtdoWnHhy5K73QENj9TEJhypmuqxabUI0EEeHr4bK3Ez KXI5BTErU4nNIrntCfxrn1YHwh+2QzGjF+mxck75oo9t5IwTUA56pJmLySgE25LX Q52Wj4qKV4Q5m19ZZ1aaHxKPtFr7++nCXsmhDP4l1unDCCqFvqJlKh5VyaiYPmhM Ir920h15dIJvGWmBNHzXPa/luGnD2+JsxN5DNnJ7BkbFospkCVWwQ/FwelXpV3Rp /8Io8s+l7SQZiBeDfYhb1i4Q/A7I3Lkswsn+XAJSh+bPzLcIjS9QqsJE/mKJAQPA znqKTcKOOFVgC4qjVW7Ld51ius11EKgpfNLVUlF2fK5j1YUlAPbnxlbE1Zlo5l3J 45LTkVtVUr4d7WCPGNib =Gmwn -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-149: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4-0-branch-point'
Tag 'libreoffice-4-0-branch-point' created by Petr Mladek pmla...@suse.cz at 2012-12-04 16:36 -0800 Tag libreoffice-4-0-branch-point -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQviaSAAoJEPQ0oe+v7q6jT+wP/Rh6q1N0scuWyX7ua+vJ2Zd0 4TKS2wKcEfxEJvfyKWRvUhAmadDiRMwJMl3hHLKq2n/077Tz/YX0sOI3RI2vM9oF wOrxYg7Er/q9JLEFDyQ/JFd7Z44WqNve1VFQpKlnjPGIDttJ906nsYEnJTW+DG2Z lGfsEyLbLUt/5r9zCH+hApvQpC+i1EWH9CbhpEL1CjUPq8CD9jQYlbVQmIxg4+wF ZJIstljEZ5quva8evdXqJJDcBL6gWMHH0m1wX1ftcgggtSYIDAemVVPbgkEg42Dr HQtA7ttLrs7SIo+B8e2pUJUI24BhFSGwwqhKdYAqw4zR7pdSyAXgey2hoOjP3Tmh mINNTGjz98VSGjx4e1Oa92+cP7C/GH9aOx4VlkcU53dhOm2D5PH3549wJ6SN+yyO hmMwd6RMFhCEHz3Df9l99S032dHkskkBW7pqOXmmNW5E6sLUPwlI/++t17LTJOQO pYPrIQ/X1r2LJgVWC43SuxfmSo/W9ytro2KfkkpqPQuJZK6yrnOKw5Ja5US2GMDW m+d/rKXzdXmfIME7tSyXcB0kBp02M51WcazmtLJOdIwBi2/GNzNlYGP52JJ0UBSh vdpIiJELztGN2BPz2NK01QHg3Wq2QSh+lsRgCHOhiSkSxZTpsL1k0HDxJLu3DhhS dOPrjByXcKJySLpEvr5p =xG3R -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-43: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4-0-branch-point'
Tag 'libreoffice-4-0-branch-point' created by Petr Mladek pmla...@suse.cz at 2012-12-04 16:35 -0800 Tag libreoffice-4-0-branch-point -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQviZpAAoJEPQ0oe+v7q6jDrgQALmjvYlWZSDTNzyUZh34HU7q KuXXgokd0ysRhfsSHaFGpRVxt0IWsTkP2ZK3ye/fGkPJ+ik/X4c8FvE4TF4VWWtS OreCaMBVSw7QcymLStaNTKrbQmfd9c3mjWNMGLTMZLAeexnnrSBGCjD2kV85FKvT +UQRWCtgumemO7DiZefKV6almGRn0uckDYF9Rgp/FdERqhANpKwCjg8vxMxAE7wx ly+nMj4y1LhY+35P0ZyZfzFLyLuyYMhIVDaQTEoz524Hn5XP+K9HBjfMEn5v5YjM st84y7P88wg6K8jcqwTYxJBSFcvyN6ovHu7hMBv/zyFS2J1q5fdeQ8Exh34Chi+r oDJ4F5P50IbxZnU3M7umTU3LrhygN6r5TtEr1MLG9Uaqz4qcPtB2gHNXdFHXKKr9 yfv45KO6YUx2jb3xkKMqhi75GdOIbeqAzsJS2gCR+Mi0S2deSX5XpmrggEF+wylf dHd0NBI7Vhr0zEIhs5DOgYMHyG9MmSwR2bnXhGWOgjPs74eSoMXf/OXqzTC/rIL2 YzagnQugwiZ/U+QiBwy6u5zni4/BQR3qAvyLjvijQ5ebtAW71sOB8ilz0Sn/OOLo 3FkXzErhm/F1/Sp6pQ6Vr1ocNqBy6MiT6lGbdkpWLBaCmNm1DDsvCS9WHjkcz138 xQh9UlQMA1wL0rayisSI =JPpE -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-10146: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - sd/source
sd/source/ui/func/fuinsert.cxx |5 +-
sd/source/ui/inc/View.hxx |4 +
sd/source/ui/view/sdview5.cxx | 90 -
3 files changed, 60 insertions(+), 39 deletions(-)
New commits:
commit 4fb4ffcc6e13b2544e0ac5578e1b52030e85a295
Author: Radek Doulik r...@novell.com
Date: Tue Dec 4 15:56:38 2012 +0100
changed behavior of insert picture
- when single graphic object shape is selected, replace the graphic with
inserted picture
- otherwise proceed as before
Change-Id: I767c3ab81abf26c34b612d6aac1f282aa0a53f6c
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 7c53bb3..980 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -138,8 +138,9 @@ void FuInsertGraphic::DoExecute( SfxRequest )
if( mpViewShell mpViewShell-ISA(DrawViewShell))
{
sal_Int8nAction = DND_ACTION_COPY;
-SdrObject* pPickObj = mpView-GetEmptyPresentationObject(
PRESOBJ_GRAPHIC );
-if( pPickObj )
+SdrObject* pPickObj;
+
+if( ( pPickObj = mpView-GetSelectedSingleObject(
mpView-GetPage() ) ) || ( pPickObj = mpView-GetEmptyPresentationObject(
PRESOBJ_GRAPHIC ) ) )
nAction = DND_ACTION_LINK;
Point aPos;
commit 8aee959c430113639685d99285974da87d251d2c
Author: Radek Doulik r...@novell.com
Date: Tue Dec 4 15:54:24 2012 +0100
refactored GetEmptyPresentationObject, added GetSelectedSingleObject
- also extracted part of GetEmptyPresentationObject into new GetPage()
method
Change-Id: I3002c3fae8236db1e443f0f454158e7298b56d70
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 7c3fa7d..8c96010 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -42,6 +42,7 @@
#include smarttag.hxx
class SdDrawDocument;
+class SdPage;
class SdrOle2Obj;
class SdrGrafObj;
class SdrMediaObj;
@@ -218,6 +219,9 @@ public:
void SetMarkedSegmentsKindPossible( bool bSet ) {
bSetMarkedSegmentsKindPossible = bSet; }
SdrObject* GetEmptyPresentationObject( PresObjKind eKind );
+SdPage* GetPage();
+SdrObject* GetSelectedSingleObject(SdPage* pPage);
+
protected:
DECL_LINK( OnParagraphInsertedHdl, ::Outliner * );
DECL_LINK( OnParagraphRemovingHdl, ::Outliner * );
diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx
index fce5e68..b2fadf1 100644
--- a/sd/source/ui/view/sdview5.cxx
+++ b/sd/source/ui/view/sdview5.cxx
@@ -51,57 +51,73 @@ static bool implIsMultiPresObj( PresObjKind eKind )
}
}
-SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind )
+SdPage* View::GetPage()
{
-SdrObject* pEmptyObj = 0;
-
+SdPage* pPage = NULL;
SdrPageView*pPV = GetSdrPageView();
if( pPV )
{
-SdPage* pPage = static_cast SdPage* ( pPV-GetPage() );
-if( pPage !pPage-IsMasterPage() )
+pPage = static_cast SdPage* ( pPV-GetPage() );
+}
+
+return pPage;
+}
+
+// returns selected object in case there's just one object in the selection
+SdrObject* View::GetSelectedSingleObject(SdPage* pPage)
+{
+SdrObject* pRet = NULL;
+if( pPage )
+{
+// first try selected shape
+if ( AreObjectsMarked() )
{
-// first try selected shape
-if ( AreObjectsMarked() )
+const SdrMarkList rMarkList = GetMarkedObjectList();
+
+if (rMarkList.GetMarkCount() == 1)
{
-/**
-* Is an empty graphic object available?
-**/
-const SdrMarkList rMarkList = GetMarkedObjectList();
+SdrMark* pMark = rMarkList.GetMark(0);
+pRet = pMark-GetMarkedSdrObj();
+}
+}
+}
-if (rMarkList.GetMarkCount() == 1)
-{
-SdrMark* pMark = rMarkList.GetMark(0);
-SdrObject* pObj = pMark-GetMarkedSdrObj();
+return pRet;
+}
-if( pObj-IsEmptyPresObj() implIsMultiPresObj(
pPage-GetPresObjKind(pObj) ) )
-pEmptyObj = pObj;
-}
-}
+SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind )
+{
+SdPage* pPage = GetPage();
+SdrObject* pEmptyObj = NULL;
-// try to find empty pres obj of same type
-if( !pEmptyObj )
+if ( pPage !pPage-IsMasterPage() ) {
+SdrObject* pObj = GetSelectedSingleObject( pPage );
+
+if( pObj pObj-IsEmptyPresObj() implIsMultiPresObj(
pPage-GetPresObjKind(pObj) ) )
+pEmptyObj = pObj;
+
+// try to find empty pres obj of same type
+if( !pEmptyObj )
+{
+int nIndex = 1;
+do
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/notemark.hxx |3 ++-
sc/source/ui/view/gridwin5.cxx | 20 +++-
sc/source/ui/view/notemark.cxx |3 +++
sc/source/ui/view/viewfun6.cxx |3 +++
4 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit cce13e3f6a42c10232653dbd52088743f935c7d0
Author: Noel Power noel.po...@suse.com
Date: Tue Dec 4 16:49:34 2012 +
fix problem with captions inserted at problematic zoom levels
also makes sure that caption drawn ( when hovering over note cell ) is drawn
at the correct position also ( e.g. corrected for zoom pos )
Change-Id: I7c06dd74d26e37d69bcc5a5734fae676aa7599e7
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index 501ec7f..acf4757 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -48,7 +48,7 @@ private:
SdrModel* pModel;
SdrObject* pObject;
sal_BoolbVisible;
-
+Point aGridOff;
DECL_LINK( TimeHdl, void* );
public:
@@ -62,6 +62,7 @@ public:
ScAddress GetDocPos() const { return aDocPos; }
sal_BoolIsByKeyboard() const{ return bByKeyboard; }
+voidSetGridOff( const Point rOff ) { aGridOff = rOff; }
};
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index a82fc30..e7e3edc 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -204,9 +204,27 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW
nPosY, bool bKeyboard )
aOrigin.Y() += aLeftSize.Height();
aMapMode.SetOrigin( aOrigin );
-pNoteMarker = new ScNoteMarker( pLeft, pRight, pBottom, pDiagonal,
+pNoteMarker = new ScNoteMarker( pLeft, pRight, pBottom, pDiagonal,
pDoc, aCellPos, aTrackText,
aMapMode, bLeftEdge, bFast,
bKeyboard );
+if ( ScDrawView* pDrawView = pViewData-GetScDrawView() )
+{
+// get position for aCellPos
+if ( pDoc )
+{
+// get draw position in hmm for aCellPos
+Point aOldPos( pDoc-GetColOffset( aCellPos.Col(),
aCellPos.Tab() ), pDoc-GetRowOffset( aCellPos.Row(), aCellPos.Tab() ) );
+aOldPos.X() = sc::TwipsToHMM( aOldPos.X() );
+aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() );
+// get screen pos in hmm for aCellPos
+// and equiv screen pos
+Point aScreenPos = pViewData-GetScrPos( aCellPos.Col(),
aCellPos.Row(), eWhich, sal_True );
+MapMode aDrawMode = GetDrawMapMode();
+Point aCurPosHmm = PixelToLogic(aScreenPos, aDrawMode );
+Point aGridOff = aCurPosHmm -aOldPos;
+pNoteMarker-SetGridOff( aGridOff );
+}
+}
}
bDone = true; // something is shown (old or new)
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 0958d8d..2735a25 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -98,7 +98,10 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl)
{
pObject = ScNoteUtil::CreateTempCaption( *pDoc, aDocPos, *pPage,
aUserText, aVisRect, bLeft );
if( pObject )
+{
+pObject-SetGridOffset( aGridOff );
aRect = pObject-GetCurrentBoundRect();
+}
// Page einfuegen damit das Model sie kennt und auch deleted
pModel-InsertPage( pPage );
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index e9ec827..86b04f6 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -42,6 +42,7 @@
#include externalrefmgr.hxx
#include cell.hxx
#include markdata.hxx
+#include drawview.hxx
#include vector
@@ -313,6 +314,8 @@ void ScViewFunc::EditNote()
return a caption object. */
if( SdrCaptionObj* pCaption = pNote-GetCaption() )
{
+if ( ScDrawView* pScDrawView = GetScDrawView() )
+ pScDrawView-SyncForGrid( pCaption );
// #i33764# enable the resize handles before starting edit mode
if( FuPoor* pDraw = GetDrawFuncPtr() )
static_cast FuSelection* ( pDraw )-ActivateNoteHandles(
pCaption );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] Branch libreoffice-4-0 created
Hi all, as promised, we have created a branch for the stabilization of the 4.0.x releases, called 'libreoffice-4-0'. It is based on master, last pull on Decemebr 4, 2012 at about 16pm UTC. See also the tag libreoffice-4-0-branch-point. The following rules apply: + only bugfixes are allowed + no approval needed during beta phase until January 7, 2013 + 1 approval needed during rc phase and upcoming bug fix releases + 3 approvals with different/no affiliation needed for late features IMPORTANT: Every developer is responsible for pushing fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable 4.0.0 release. Do not forget to push useful fixes to this branch. git cherry-pick commit-id is your friend :-) The 'master' branch is used for 4.1 development and has the rules: + free commit; do your best to do not break build and functionality + any development allowed For further information about the roadmap, please check http://wiki.documentfoundation.org/ReleasePlan Now, if you want to switch your clone to the libreoffice-4-0 branch, do: ./g pull -r ./g checkout -b libreoffice-4-0 origin/libreoffice-4-0 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; ie. libreoffice-4-0 when you have switched to it. This will save you some git shouting at you. Happy hacking, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/msodraw.py
src/msodraw.py |9 +
1 file changed, 9 insertions(+)
New commits:
commit b1d24d38c9e2740cd39c66c7db9d6d442f5126f7
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Dec 4 17:48:24 2012 +0100
msodraw: add xml dumper method for RecordHeader
diff --git a/src/msodraw.py b/src/msodraw.py
index 26835ff..eec9545 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -99,6 +99,14 @@ class RecordHeader:
RecordHeader.appendHeaderLine(recHdl, pre + version: 0x%1.1X
instance: 0x%3.3X size: %d%
(self.recVer, self.recInstance, self.recLen))
+def dumpXml(self, recHdl):
+recHdl.appendLine('rh type=OfficeArtRecordHeader')
+recHdl.appendLine('recVer value=0x%1.1X/' % self.recVer)
+recHdl.appendLine('recInstance value=0x%1.1X/' % self.recInstance)
+recHdl.appendLine('recType value=0x%1.1X/' % self.recType)
+recHdl.appendLine('recLen value=0x%1.1X/' % self.recLen)
+recHdl.appendLine('/rh')
+
class ColorRef:
def __init__ (self, byte):
@@ -605,3 +613,4 @@ class MSODrawHandler(globals.ByteStream):
bytes = self.readBytes(rh.recLen)
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/osl sal/qa
sal/osl/unx/util.c |9 +++--
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |1 +
sal/qa/osl/file/osl_File.cxx | 27 ++-
3 files changed, 6 insertions(+), 31 deletions(-)
New commits:
commit 00e93626d109594bb3eb58405c0b2cc205e6711c
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 4 18:00:55 2012 +0100
replace #pragma weak with __attribute__((weak))
They do the same in this case, but clang doesn't know the former and warns.
Change-Id: I4895f80d4b25c147e073f3fea7db6fd2acfb84a4
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index c4c5654..cd8bc9a 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -349,12 +349,9 @@ void osl_interlockedCountCheckForSingleCPU(void)
//java. Quite possibly also required/helpful for s390x/s390 and maybe some
//others. Without it the dlopen of libjvm.so will fail with __data_start
//not found
-#pragma weak __data_start
-extern int __data_start[];
-#pragma weak data_start
-extern int data_start[];
-#pragma weak _end
-extern int _end[];
+extern int __data_start[] __attribute__((weak));
+extern int data_start[] __attribute__((weak));
+extern int _end[] __attribute__((weak));
static void *dummy[] __attribute__((used)) = {__data_start, data_start, _end};
#endif
commit 8a5961a7ee750ae2a2bcd73a4859486d00f00b6d
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 4 17:50:26 2012 +0100
remove unused variables and code
Change-Id: I4cd76fb5bb3187a9a25e9a73556c8ee3be1a5361
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 0f20592..18fab17 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -137,6 +137,7 @@ namespace rtl_OStringBuffer
rtl::OStringBuffer b1;
b1.makeStringAndClear();
rtl::OStringBuffer b2(b1);
+(void)b2;
}
void ctor_006()
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 1b4fa25..79a52fb 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -426,7 +426,6 @@ inline void createTestDirectory( const ::rtl::OUString
dirname )
inline void createTestDirectory( const ::rtl::OUString basename, const
::rtl::OUString dirname )
{
::rtl::OUString aBaseURL = basename.copy( 0 );
-::rtl::OString aString;
concatURL( aBaseURL, dirname );
createTestDirectory( aBaseURL );
@@ -518,29 +517,8 @@ inline sal_Bool checkFile( const ::rtl::OUString str,
oslCheckMode nCheckMode
//check if the file exist
inline sal_Bool ifFileExist( const ::rtl::OUString str )
{
-sal_Bool bCheckResult = sal_False;
-
-/*#ifdef WNT
-::rtl::OUString aUStr = str.copy( 0 );
-if ( isURL( str ) )
-::osl::FileBase::getSystemPathFromFileURL( str, aUStr );
-
-::rtl::OString aString = ::rtl::OUStringToOString( aUStr,
RTL_TEXTENCODING_ASCII_US );
-const char *path = aString.getStr();
-if (( _access( path, 0 ) ) != -1 )
- bCheckResult = sal_True;
-#else*/
-::rtl::OString aString = ::rtl::OUStringToOString( str,
RTL_TEXTENCODING_ASCII_US );
-// const char *path = aString.getStr();
::osl::File testFile( str );
-bCheckResult = ( osl::FileBase::E_None == testFile.open(
osl_File_OpenFlag_Read ) );
-//if (bCheckResult)
-//printf(%s exist!\n, path);
-//else
-//printf(%s not exist!\n, path);
-//#endif
-return bCheckResult;
-
+return ( osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Read )
);
}
//check if the file can be writen
@@ -788,7 +766,7 @@ namespace osl_FileBase
void getAbsoluteFileURL::getAbsoluteFileURL_002()
{
#if ( defined UNX ) //Link is not defined in Windows
-::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ),
aUStr_SrcFileSys( aTempDirectorySys );
+::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ),
aUStr_SrcFileSys( aTempDirectorySys );
( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID() ) +=
::rtl::OUString(/link.file);
( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID() ) +=
::rtl::OUString(/canonical.name);
@@ -5501,7 +5479,6 @@ namespace osl_Directory
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
//check the file name
-::rtl::OUString strFilename;
sal_BoolbOk1 = sal_False;
sal_Bool bOk2 = sal_False;
sal_Bool bOk3 = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/sdi
sc/sdi/formatsh.sdi |1 + 1 file changed, 1 insertion(+) New commits: commit a6f8eb4ed1e237b49c19ed015487504f81051005 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Tue Dec 4 18:05:19 2012 +0100 Fixed removed entry for SID_STYLE_HIDE in sc/sdi/formatsh.sdi Change-Id: I374173f5a91235fa16ca84e6a26d947cd0009e0d diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index 13884ce..dd78853 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -58,6 +58,7 @@ interface FormatForSelection SID_STYLE_FAMILY4 [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] SID_STYLE_EDIT [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] SID_STYLE_DELETE[ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] +SID_STYLE_HIDE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] SID_STYLE_SHOW [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] // } Slot's die in der DrawShell disabled werden. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/sdi
sc/sdi/formatsh.sdi |1 + 1 file changed, 1 insertion(+) New commits: commit 5370f412b8f7b954c32973c6649ff9a97eb0e2d6 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Tue Dec 4 18:05:19 2012 +0100 Fixed removed entry for SID_STYLE_HIDE in sc/sdi/formatsh.sdi Change-Id: I374173f5a91235fa16ca84e6a26d947cd0009e0d diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index 13884ce..dd78853 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -58,6 +58,7 @@ interface FormatForSelection SID_STYLE_FAMILY4 [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] SID_STYLE_EDIT [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] SID_STYLE_DELETE[ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] +SID_STYLE_HIDE [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] SID_STYLE_SHOW [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ] // } Slot's die in der DrawShell disabled werden. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/docdirstream.py src/docdraw.py src/msodraw.py
src/docdirstream.py | 11 + src/docdraw.py | 110 src/msodraw.py |2 3 files changed, 57 insertions(+), 66 deletions(-) New commits: commit bbb8a8ca97b25263d0f35ad738820b54d1b69729 Author: Miklos Vajna vmik...@suse.cz Date: Tue Dec 4 18:10:05 2012 +0100 docdraw: use msodraw.RecordHandler instead of the own OfficeArtRecordHeader diff --git a/src/docdirstream.py b/src/docdirstream.py index df1ea54..72f2d1c 100644 --- a/src/docdirstream.py +++ b/src/docdirstream.py @@ -124,4 +124,15 @@ class DOCDirStream: def dump(self): print 'stream name=%s size=%s/' % (globals.encodeName(self.name), self.size) +# compat methods to make msodraw happy +def readUnsignedInt(self, size): +if size == 2: +return self.readuInt16() +elif size == 4: +return self.readuInt32() +raise Exception + +def appendLine(self, line): +print line + # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: diff --git a/src/docdraw.py b/src/docdraw.py index 82bc79f..f3cd9d3 100644 --- a/src/docdraw.py +++ b/src/docdraw.py @@ -9,37 +9,7 @@ import struct import globals from docdirstream import DOCDirStream import docsprm - -class OfficeArtRecordHeader(DOCDirStream): -The OfficeArtRecordHeader record specifies the common record header for all the OfficeArt records. -size = 8 -def __init__(self, parent, name = None, pos = None): -DOCDirStream.__init__(self, parent.bytes) -self.name = name -if pos: -self.pos = pos -else: -self.pos = parent.pos -self.posOrig = self.pos -self.parent = parent - -def dump(self, parseOnly = False): -if not parseOnly: -print '%s type=OfficeArtRecordHeader offset=%d size=%d bytes' % (self.name, self.pos, OfficeArtRecordHeader.size) -buf = self.readuInt16() -self.printAndSet(recVer, buf 0x000f, silent = parseOnly) # 1..4th bits -self.printAndSet(recInstance, (buf 0xfff0) 4, silent = parseOnly) # 5..16th bits - -self.printAndSet(recType, self.readuInt16(), silent = parseOnly) -self.printAndSet(recLen, self.readuInt32(), silent = parseOnly) -if not parseOnly: -print '/%s' % self.name -assert self.pos == self.posOrig + OfficeArtRecordHeader.size -if not parseOnly: -self.parent.pos = self.pos - -def parse(self): -self.dump(True) +import msodraw class OfficeArtFDGG(DOCDirStream): The OfficeArtFDGG record specifies documnet-wide information about all of the drawings that have been saved in the file. @@ -82,7 +52,7 @@ class OfficeArtFDGGBlock(DOCDirStream): def dump(self): print 'drawingGroup type=OfficeArtFDGGBlock offset=%d' % self.pos -OfficeArtRecordHeader(self, rh).dump() +msodraw.RecordHeader(self).dumpXml(self) self.head = OfficeArtFDGG(self, head) self.head.dump() for i in range(self.head.cidcl - 1): @@ -119,7 +89,7 @@ class OfficeArtSplitMenuColorContainer(DOCDirStream): def dump(self): print 'splitColors type=OfficeArtSplitMenuColorContainer offset=%d' % self.pos -OfficeArtRecordHeader(self, rh).dump() +msodraw.RecordHeader(self).dumpXml(self) for i in [fill, line, shadow, 3d]: print 'smca type=%s' % i MSOCR(self).dump() @@ -136,19 +106,21 @@ class OfficeArtDggContainer(DOCDirStream): def dump(self): print '%s type=OfficeArtDggContainer offset=%d' % (self.name, self.pos) -self.rh = OfficeArtRecordHeader(self, rh) -self.rh.dump() +self.rh = msodraw.RecordHeader(self) +self.rh.dumpXml(self) pos = self.pos while (self.rh.recLen - (pos - self.pos)) 0: -rh = OfficeArtRecordHeader(self, pos = pos) -rh.parse() +posOrig = self.pos +self.pos = pos +rh = msodraw.RecordHeader(self) +self.pos = posOrig if rh.recType in recMap: child = recMap[rh.recType](self, pos) child.dump() -assert child.pos == pos + OfficeArtRecordHeader.size + rh.recLen +assert child.pos == pos + msodraw.RecordHeader.size + rh.recLen else: print 'todo what=OfficeArtDggContainer: recType = %s unhandled (size: %d bytes)/' % (hex(rh.recType), rh.recLen) -pos += OfficeArtRecordHeader.size + rh.recLen +pos += msodraw.RecordHeader.size + rh.recLen print '/%s' % self.name assert pos == self.pos + self.rh.recLen self.officeArtContent.pos = pos @@ -161,7 +133,7 @@ class OfficeArtFDG(DOCDirStream): def dump(self): print 'drawingData type=OfficeArtFDG offset=%d' % self.pos -OfficeArtRecordHeader(self, rh).dump() +
[Libreoffice-commits] .: desktop/source
desktop/source/migration/services/oo3extensionmigration.cxx | 25 ++--
1 file changed, 14 insertions(+), 11 deletions(-)
New commits:
commit bd9c4510ff13ab7e935ed12c5b6d1f132c6f2b79
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 4 18:11:58 2012 +0100
Take extra cache/uno_packages/*.tmp_/*properties files into account
...when migrating user extensions from an old user profile.
Change-Id: I4425eba1e840bfdb33782bb3ed0542ce48b2f75f
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx
b/desktop/source/migration/services/oo3extensionmigration.cxx
index d994e0d..aed03fa 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -137,22 +137,25 @@ void OO3ExtensionMigration::scanUserExtensions( const
::rtl::OUString sSourceDi
//Check next folder as the real extension folder is below a
temp folder!
::rtl::OUString sExtensionFolderURL = fs.getFileURL();
-osl::DirectoryItem aExtDirItem;
osl::Directory aExtensionRootDir( sExtensionFolderURL );
nRetCode = aExtensionRootDir.open();
-if (( nRetCode == osl::Directory::E_None )
-( aExtensionRootDir.getNextItem( aExtDirItem, nHint ) ==
osl::Directory::E_None ))
+if ( nRetCode == osl::Directory::E_None )
{
-bool bFileStatus = aExtDirItem.getFileStatus(fs) ==
osl::FileBase::E_None;
-bool bIsDir = fs.getFileType() ==
osl::FileStatus::Directory;
-
-if ( bFileStatus bIsDir )
+osl::DirectoryItem aExtDirItem;
+while ( aExtensionRootDir.getNextItem( aExtDirItem, nHint
) == osl::Directory::E_None )
{
-sExtensionFolderURL = fs.getFileURL();
-ScanResult eResult = scanExtensionFolder(
sExtensionFolderURL );
-if ( eResult == SCANRESULT_MIGRATE_EXTENSION )
-aMigrateExtensions.push_back( sExtensionFolderURL
);
+bool bFileStatus = aExtDirItem.getFileStatus(fs) ==
osl::FileBase::E_None;
+bool bIsDir = fs.getFileType() ==
osl::FileStatus::Directory;
+
+if ( bFileStatus bIsDir )
+{
+sExtensionFolderURL = fs.getFileURL();
+ScanResult eResult = scanExtensionFolder(
sExtensionFolderURL );
+if ( eResult == SCANRESULT_MIGRATE_EXTENSION )
+aMigrateExtensions.push_back(
sExtensionFolderURL );
+break;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - desktop/source
desktop/source/migration/services/oo3extensionmigration.cxx | 25 ++--
1 file changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 1ec09234241ac0d952559a104dfa5abfd4474954
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 4 18:11:58 2012 +0100
Take extra cache/uno_packages/*.tmp_/*properties files into account
...when migrating user extensions from an old user profile.
Change-Id: I4425eba1e840bfdb33782bb3ed0542ce48b2f75f
(cherry picked from commit bd9c4510ff13ab7e935ed12c5b6d1f132c6f2b79)
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx
b/desktop/source/migration/services/oo3extensionmigration.cxx
index d994e0d..aed03fa 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -137,22 +137,25 @@ void OO3ExtensionMigration::scanUserExtensions( const
::rtl::OUString sSourceDi
//Check next folder as the real extension folder is below a
temp folder!
::rtl::OUString sExtensionFolderURL = fs.getFileURL();
-osl::DirectoryItem aExtDirItem;
osl::Directory aExtensionRootDir( sExtensionFolderURL );
nRetCode = aExtensionRootDir.open();
-if (( nRetCode == osl::Directory::E_None )
-( aExtensionRootDir.getNextItem( aExtDirItem, nHint ) ==
osl::Directory::E_None ))
+if ( nRetCode == osl::Directory::E_None )
{
-bool bFileStatus = aExtDirItem.getFileStatus(fs) ==
osl::FileBase::E_None;
-bool bIsDir = fs.getFileType() ==
osl::FileStatus::Directory;
-
-if ( bFileStatus bIsDir )
+osl::DirectoryItem aExtDirItem;
+while ( aExtensionRootDir.getNextItem( aExtDirItem, nHint
) == osl::Directory::E_None )
{
-sExtensionFolderURL = fs.getFileURL();
-ScanResult eResult = scanExtensionFolder(
sExtensionFolderURL );
-if ( eResult == SCANRESULT_MIGRATE_EXTENSION )
-aMigrateExtensions.push_back( sExtensionFolderURL
);
+bool bFileStatus = aExtDirItem.getFileStatus(fs) ==
osl::FileBase::E_None;
+bool bIsDir = fs.getFileType() ==
osl::FileStatus::Directory;
+
+if ( bFileStatus bIsDir )
+{
+sExtensionFolderURL = fs.getFileURL();
+ScanResult eResult = scanExtensionFolder(
sExtensionFolderURL );
+if ( eResult == SCANRESULT_MIGRATE_EXTENSION )
+aMigrateExtensions.push_back(
sExtensionFolderURL );
+break;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/util
sal/util/sal.map |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1eddfce9894fd05315173744f495619189093dc7
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 4 18:34:17 2012 +0100
LIBO_UDK_3.7 - LIBO_UDK_4.0
There will be no 3.7.
Change-Id: Ib2808aa259baaa7eac42c7ec7a640105fc8c07a1
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 3c5e787..ade61cd 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -645,7 +645,7 @@ LIBO_UDK_3.6 { # symbols available in = LibO 3.6
rtl_uStringBuffer_makeStringAndClear;
} UDK_3.10;
-LIBO_UDK_3.7 { # symbols available in = LibO 3.7
+LIBO_UDK_4.0 { # symbols available in = LibO 4.0
global:
rtl_string_newFromSubString;
rtl_uString_newFromSubString;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sal/util
sal/util/sal.map |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9f8c5dcc9c3d7e81d150ded08725c6c123d49cf
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Dec 4 18:34:17 2012 +0100
LIBO_UDK_3.7 - LIBO_UDK_4.0
There will be no 3.7.
Change-Id: Ib2808aa259baaa7eac42c7ec7a640105fc8c07a1
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 3c5e787..ade61cd 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -645,7 +645,7 @@ LIBO_UDK_3.6 { # symbols available in = LibO 3.6
rtl_uStringBuffer_makeStringAndClear;
} UDK_3.10;
-LIBO_UDK_3.7 { # symbols available in = LibO 3.7
+LIBO_UDK_4.0 { # symbols available in = LibO 4.0
global:
rtl_string_newFromSubString;
rtl_uString_newFromSubString;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] adding calc add-in for option pricing
Do I also have to change the function name exported to the cell, e.g.
OPT_BARRIER()?
My concern here would be that potentially calc function naming is not
always a great match to UNO constraints - and yet those functions are
defined as IDL. Some functions have '.'s in them IIRC, others might want
to have _'s (?) and translating functions is prolly not feasible via the
UNO interface.
Not sure I understand, would you prefer to see no '_' and rather
me to change OPT_BARRIER() to OPTBARRIER() or something?
I've attached a patch to sort out the internal UNO variable/function
naming issue.
Cheers, Tino
From 4e61de11fb73973519d409c39ec66c84d3316f9b Mon Sep 17 00:00:00 2001
From: tino ttk...@gmail.com
Date: Tue, 4 Dec 2012 17:26:52 +
Subject: [PATCH] changed function names and variables to conform with UNO
style
Change-Id: I3de884b54083a6916a5baed4d475016aa9d4ddec
---
.../com/sun/star/sheet/addin/XPricingFunctions.idl | 46 +++---
scaddins/source/pricing/pricing.cxx| 20 +-
scaddins/source/pricing/pricing.hrc| 34
scaddins/source/pricing/pricing.hxx| 8 ++--
scaddins/source/pricing/pricing.src| 16
5 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl
index 495891a..12d66d8d 100644
--- a/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl
+++ b/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl
@@ -38,34 +38,36 @@ module addin
*/
interface XPricingFunctions : com::sun::star::uno::XInterface
{
-/// opt_barrier()
-double getOpt_barrier( [in] double spot, [in] double vol,
-[in] double r, [in] double rf, [in] double T, [in] double strike,
-[in] double barrier_low, [in] double barrier_up,
-[in] double rebate,
-[in] string put_call, [in] string in_out,
-[in] string continuous, [in] any greek )
+/// OPT_BARRIER(), pricing of a barrier option.
+double getOptBarrier( [in] double Spot, [in] double Vol,
+[in] double Rate, [in] double RateForeign,
+[in] double Maturity, [in] double Strike,
+[in] double BarrierLow, [in] double BarrierUp,
+[in] double Rebate,
+[in] string PutCall, [in] string InOut,
+[in] string Continuous, [in] any Greek )
raises( com::sun::star::lang::IllegalArgumentException );
-/// opt_touch()
-double getOpt_touch( [in] double spot, [in] double vol,
-[in] double r, [in] double rf, [in] double T,
-[in] double barrier_low, [in] double barrier_up,
-[in] string for_dom, [in] string in_out,
-[in] string continuous, [in] any greek )
+/// OPT_TOUCH(), pricing of a touch/no-touch option.
+double getOptTouch( [in] double Spot, [in] double Vol,
+[in] double Rate, [in] double RateForeign,
+[in] double Maturity,
+[in] double BarrierLow, [in] double BarrierUp,
+[in] string ForeignDomestic, [in] string InOut,
+[in] string Continuous, [in] any Greek )
raises( com::sun::star::lang::IllegalArgumentException );
-/// opt_prob_hit()
-double getOpt_prob_hit( [in] double spot, [in] double vol,
-[in] double mu, [in] double T,
-[in] double barrier_low, [in] double barrier_up )
+/// OPT_PROB_HIT(), probability of hitting a barrier.
+double getOptProbHit( [in] double Spot, [in] double Vol,
+[in] double Mu, [in] double Maturity,
+[in] double BarrierLow, [in] double BarrierUp )
raises( com::sun::star::lang::IllegalArgumentException );
-/// opt_prob_inmoney()
-double getOpt_prob_inmoney( [in] double spot, [in] double vol,
-[in] double mu, [in] double T,
-[in] double barrier_low, [in] double barrier_up,
-[in] any strike, [in] any put_call )
+/// OPT_PROB_INMONEY(), probability of ending up in-the-money.
+double getOptProbInMoney( [in] double Spot, [in] double Vol,
+[in] double Mu, [in] double Maturity,
+[in] double BarrierLow, [in] double BarrierUp,
+[in] any Strike, [in] any PutCall )
raises( com::sun::star::lang::IllegalArgumentException );
};
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index ba4cb31..cf65787 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -110,10 +110,10 @@ ScaResId::ScaResId( sal_uInt16 nId, ResMgr rResMgr ) :
const ScaFuncDataBase pFuncDataArr[] =
{
- FUNCDATA( Opt_barrier, 13, ScaCat_Finance,UNIQUE, STDPAR),
- FUNCDATA( Opt_touch, 11, ScaCat_Finance,
license statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: opinions on additional calc functions
I've also got an example/test spreadsheet, but didn't quite know where to put it. The right solution is to extend the existing function (import) tests in sc/qa/unit/subsequent_filters-test.cxx with the test file being in sc/qa/unit/data/ods/functions.ods Ok, this is something I'll keep in mind for the future, but won't be able to do quickly. What about example files for the end user to see the functions of an add-in in action? My example file is 130k. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source
vcl/source/window/window.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b8a3c7d71255adc58cb254fca180ca374ae4b516 Author: Abdulmajeed Al-Abaulrazzaq aalabdulraz...@kacst.edu.sa Date: Wed Nov 28 14:58:52 2012 +0300 Resolves: fdo#43901 and fdo#42577 RTL tollbars mirroring Change-Id: I32dd8cdd34965bf8dd31729a79b65d8ee78af7dc Reviewed-on: https://gerrit.libreoffice.org/1187 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz (cherry picked from commit aa61177f1d339422acb3322c8851962cd1ca7466) Signed-off-by: Lior Kaplan kaplanl...@gmail.com diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 4d33be5..8a39656 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -777,7 +777,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste } if( pParent ! mpWindowImpl-mbFrame ) -mbEnableRTL = pParent-mbEnableRTL; +mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // test for frame creation if ( mpWindowImpl-mbFrame ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/gridwin5.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be76d34849f95568e333a2af28bf61411eab3124
Author: Tor Lillqvist t...@iki.fi
Date: Tue Dec 4 20:46:36 2012 +0200
WaE: unused variable 'pDrawView'
Change-Id: Ide676ba1127a69dd2b787a57623a23d1ee13aaac
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index e7e3edc..9789a24 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -207,7 +207,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW
nPosY, bool bKeyboard )
pNoteMarker = new ScNoteMarker( pLeft, pRight, pBottom, pDiagonal,
pDoc, aCellPos, aTrackText,
aMapMode, bLeftEdge, bFast,
bKeyboard );
-if ( ScDrawView* pDrawView = pViewData-GetScDrawView() )
+if ( pViewData-GetScDrawView() )
{
// get position for aCellPos
if ( pDoc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - scripting/source sc/source sw/source vbahelper/source
sc/source/ui/vba/vbaapplication.cxx |3 +--
sc/source/ui/vba/vbahelper.cxx |4 +---
scripting/source/basprov/basscript.cxx |4 +---
sw/source/ui/vba/vbaapplication.cxx |2 +-
vbahelper/source/vbahelper/vbahelper.cxx |5 +
5 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 0990da105f89004f6071cf8cfee271e8b5f2d2c8
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 4 19:36:15 2012 +0100
clean up more sbxToUnoValue declarations
Change-Id: Ieff54baaff53031712f737dab84f840adb3bb09a
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index a3dbb0e..f8ae29e 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -41,6 +41,7 @@
#include basic/sbx.hxx
#include basic/sbstar.hxx
+#include basic/sbuno.hxx
#include rtl/math.hxx
#include math.h
@@ -55,9 +56,6 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba;
#define POINTTO100THMILLIMETERFACTOR 35.27778
-void unoToSbxValue( SbxVariable* pVar, const uno::Any aValue );
-
-uno::Any sbxToUnoValue( SbxVariable* pVar );
namespace ooo
diff --git a/scripting/source/basprov/basscript.cxx
b/scripting/source/basprov/basscript.cxx
index cc92f95..98624b0 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -24,6 +24,7 @@
#include basic/sbstar.hxx
#include basic/sbmod.hxx
#include basic/sbmeth.hxx
+#include basic/sbuno.hxx
#include basic/basmgr.hxx
#include com/sun/star/script/provider/ScriptFrameworkErrorType.hpp
#include bcholder.hxx
@@ -40,9 +41,6 @@ using namespace ::com::sun::star::script;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::beans;
-extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
-extern void unoToSbxValue( SbxVariable* pVar, const
::com::sun::star::uno::Any aValue );
-
//.
namespace basprov
diff --git a/sw/source/ui/vba/vbaapplication.cxx
b/sw/source/ui/vba/vbaapplication.cxx
index 2a091ba..a9f9f8d 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -29,6 +29,7 @@
#include vbaaddins.hxx
#include vbadialogs.hxx
#include ooo/vba/word/WdEnableCancelKey.hpp
+#include basic/sbuno.hxx
#include editeng/acorrcfg.hxx
#include wordvbahelper.hxx
#include docsh.hxx
@@ -52,7 +53,6 @@ using ::rtl::OUString;
#define EXCELVERSION 11.0
-uno::Any sbxToUnoValue( SbxVariable* pVar );
SwVbaApplication::SwVbaApplication( uno::Referenceuno::XComponentContext
xContext ): SwVbaApplication_BASE( xContext )
{
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx
b/vbahelper/source/vbahelper/vbahelper.cxx
index f0f2f06..0274b1f 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -57,6 +57,7 @@
#include basic/basmgr.hxx
#include basic/sbmod.hxx
#include basic/sbmeth.hxx
+#include basic/sbuno.hxx
#include rtl/math.hxx
#include sfx2/viewsh.hxx
#include math.h
@@ -76,10 +77,6 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-void unoToSbxValue( SbxVariable* pVar, const uno::Any aValue );
-
-uno::Any sbxToUnoValue( SbxVariable* pVar );
-
namespace ooo
{
commit 7fe270b5718b8791128b9b8faee8b3e7d04f2be7
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 4 19:22:52 2012 +0100
warning C4273: sbxToUnoValue: inconsistent dll linkage
Change-Id: I4677038ea4c702dfcea70a018c119ed31bb2cc60
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index 1ededa0..f15f0ab 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -87,6 +87,7 @@
#include excelvbahelper.hxx
#include basic/sbmod.hxx
+#include basic/sbuno.hxx
#include basic/sbxobj.hxx
#include viewutil.hxx
@@ -105,8 +106,6 @@ using ::rtl::OUString;
#define FILE_PATH_SEPERATOR \\
#endif
-uno::Any sbxToUnoValue( SbxVariable* pVar );
-
//
/** Global application settings shared by all open workbooks. */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Grammar checking] Using LanguageTool lexicons with Lightproof new possible
My connection ended while posting. Here is the full post: Hello everyone, ## Build indexable binary grammatically tagged dictionaries for Lightproof/Grammalecte ## The most important limitation for building a grammar checker with Lightproof was the lack of grammatically tagged dictionaries. Most of Hunspell dictionaries, which Lightproof can handle via LibreOffice-UNO, are not grammatically tagged and cannot be of any help to retrieve morphological information about words. LanguageTool has not this problem since it’s using binary indexable dictionaries built on huge grammatically tagged lexicons with a finite-state automaton (fsa) software (http://www.eti.pg.gda.pl/katedry/kiw/pracownicy/Jan.Daciuk/personal/fsa.html) written in C. Java has a dedicated library to read these binary files. But we had nothing such as this in Python. So I tried to understand how this FSA software in C works, but as I am not a C expert and as I was upset to depend again on another software, I finally decided to write my own FSA tool to build such indexable binary dictionaries. Why build such dictionaries? you may ask. Because lexicons which contain words, lemmas and morphological tags are HUGE, up to several megabytes, they are not indexable as is and it uses much more memory to make them such. So the goal is to make them small, compressed, quick to load and to parse, low memory consuming, indexable, readable without having to uncompress them. That’s what I did with Python 3.3. I took all lexicons from LanguageTool and I compressed them in binary indexable dictionaries readable with my own script. The built dictionaries are not as small as the ones made with the C FSA tool used by LT, but it’s close enough and there is still room for improvements. I’ll work on this later. Here are the results: These dictionaries are about 5-30 % bigger than the LT ones (and sometimes surprisingly twice smaller), but anyhow it’s perfectly usable as is. Consequences: — it will be possible to use all existing LT lexicons with Lightproof, — we will be able to make a stand-alone version of Lightproof/Grammalecte as it won’t be necessary to use Hunspell anymore, — we will be able to write automated tests and prevent regressions when writting/modifying rules. # Lexicons Lexicon are simple text document listing all flexions, their stem and their morphological tags: Each field is separated with a tabulation. With the new tool, lexicons MUST be UTF-8 encoded to be properly converted. # Want to test it? The code is written with Python 3.3. License: MPL 2. Two files: — fsa_builder.py reads all files listed in _lexicons.list.txt and builds binary dictionaries with a specific stemming command. — fsa_reader.py reads all files whose name is [lang].bdic, and if it finds a test file named [lang].test.txt writes results found for each word in a new file. The builder with uncompressed LT lexicons encoded in UTF-8: http://dicollecte.free.fr/download/fsa1/pyFSA_builder.7z [130 Mb] Type: And let it run. Warning: building dictionaries is slow, as lexicons are huge. For most langages it takes 1 or 2 minutes for each. But for german, polish, galician, russian, czech, it tooks 5 to 10 minutes for each, and it consumes a huge amount of memory. The czech uses up to 6 Gb! You have been warned. :) The dictionary reader with binary dictionaries and test files: http://dicollecte.free.fr/download/fsa1/pyFSA_reader.7z [11 Mb] Type: Let it run. Count to 1 (or 2 if you have a slow computer). And it’s already finished. :) It has read all binary dictionaries, read the test files, and written the results in other files. I’ll try to write a more complete web page about this when I have the time. I still have to compress it better, for those who might think it’s not enough. Regards, Olivier R. -- View this message in context: http://nabble.documentfoundation.org/Grammar-checking-Using-LanguageTool-lexicons-with-Lightproof-new-possible-tp4022489p4022495.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: opinions on additional calc functions
On Tue, Dec 04, 2012 at 05:50:25PM +, tino wrote: I've also got an example/test spreadsheet, but didn't quite know where to put it. The right solution is to extend the existing function (import) tests in sc/qa/unit/subsequent_filters-test.cxx with the test file being in sc/qa/unit/data/ods/functions.ods Ok, this is something I'll keep in mind for the future, but won't be able to do quickly. It is not as complex as it sounds. See http://wiki.documentfoundation.org/Development/Calc_Import_Unit_Tests for some more details and how easy it is to add test cases for new functions. What about example files for the end user to see the functions of an add-in in action? My example file is 130k. We only have an additional test file repository for developers but this will not help users in any way. I think we currently have only the help in helpcontent2 for calc functions. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f2cce815d17ecab4a9440d3cae2064db60fa5d2c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Dec 4 20:24:01 2012 +0100
also workaround strange crash with ref edit field for formula condition
Change-Id: I96a08b04215fdb22af5e1d2b21512544ebcc0f3a
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index fe2d0e3..96c9bda 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -500,7 +500,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent,
ScDocument* pDoc, const
maFtStyle( this, ScResId( FT_STYLE ) ),
maLbStyle( this, ScResId( LB_STYLE ) ),
maWdPreview( this, ScResId( WD_PREVIEW ) ),
-maEdFormula( this, static_castScAnyRefDlg*(pParent-GetParent()),
ScResId( ED_FORMULA ) )
+maEdFormula( this, NULL, ScResId( ED_FORMULA ) )
{
Init();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20972abfb4f12c89c6390e834f618eb2940c8201
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Dec 4 20:24:01 2012 +0100
also workaround strange crash with ref edit field for formula condition
Change-Id: I96a08b04215fdb22af5e1d2b21512544ebcc0f3a
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index fe2d0e3..96c9bda 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -500,7 +500,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent,
ScDocument* pDoc, const
maFtStyle( this, ScResId( FT_STYLE ) ),
maLbStyle( this, ScResId( LB_STYLE ) ),
maWdPreview( this, ScResId( WD_PREVIEW ) ),
-maEdFormula( this, static_castScAnyRefDlg*(pParent-GetParent()),
ScResId( ED_FORMULA ) )
+maEdFormula( this, NULL, ScResId( ED_FORMULA ) )
{
Init();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/source vcl/inc vcl/source
sc/source/ui/src/sortdlg.src |1
vcl/inc/ilstbox.hxx| 10 --
vcl/inc/vcl/builder.hxx| 14 ---
vcl/inc/vcl/button.hxx |7 -
vcl/inc/vcl/ctrl.hxx |1
vcl/inc/vcl/edit.hxx |1
vcl/inc/vcl/field.hxx |5 -
vcl/inc/vcl/fixed.hxx |2
vcl/inc/vcl/lstbox.hxx |1
vcl/inc/vcl/spinfld.hxx|1
vcl/inc/vcl/tabctrl.hxx|3
vcl/inc/vcl/window.hxx |5 -
vcl/source/control/button.cxx | 103 ---
vcl/source/control/ctrl.cxx| 15
vcl/source/control/edit.cxx| 37 -
vcl/source/control/field.cxx | 51 -
vcl/source/control/fixed.cxx | 24 --
vcl/source/control/ilstbox.cxx | 76
vcl/source/control/lstbox.cxx | 29 ---
vcl/source/control/spinfld.cxx | 29 ---
vcl/source/control/tabctrl.cxx | 18
vcl/source/window/builder.cxx | 83 +-
vcl/source/window/dialog.cxx | 71 ---
vcl/source/window/printdlg.cxx |1
vcl/source/window/tabpage.cxx | 11 --
vcl/source/window/window.cxx |4 -
vcl/source/window/window2.cxx | 152 -
27 files changed, 10 insertions(+), 745 deletions(-)
New commits:
commit 65e36f20761ff191816f9a7e32da750ca3001e45
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 4 20:06:13 2012 +
sort printers
Change-Id: Idd9e10211eedbe23cabc92a7f1b1c0416fef480e
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4776f39..0e63800 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -476,6 +476,7 @@ PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder
)
, mnCollateUIMode( 0 )
{
pUIBuilder-get(mpPrinters, printers);
+mpPrinters-SetStyle(mpPrinters-GetStyle() | WB_SORT);
pUIBuilder-get(mpStatusTxt, status);
pUIBuilder-get(mpLocationTxt, location);
pUIBuilder-get(mpCommentTxt, comment);
commit 0bde9091b00516096657cb7ed82898d486072355
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 4 17:11:52 2012 +
remove ability to auto-replace .res widgets with .ui versions
it worked, and was sort of cool, but complicated and potentially fragile and
I've lost interest in maintaining it as a stepping stone towards full .ui
conversion in favour of just fully converted to .ui
Change-Id: I27cfd4061ef15cd691ac6ddaa7155afd025182ec
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 8a851af..93203f5 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -187,8 +187,6 @@ public:
first selectable entry after nPos is bForward is false.
*/
sal_uInt16 FindFirstSelectable( sal_uInt16 nPos, bool bForward =
true );
-
-void take_properties(ImplEntryList rOther);
};
// -
@@ -381,11 +379,6 @@ public:
inline void EnableMirroring() { mbMirroring = sal_True; }
inline sal_Bool IsMirroring() const { return mbMirroring; }
-/*
- * Takes ownership of the rOther properties
- */
-virtual void take_properties(Window rOther);
-
protected:
// ISearchableStringList
virtual ::vcl::StringEntryIdentifierCurrentEntry( String
_out_entryText ) const;
@@ -513,8 +506,6 @@ public:
// pb: #106948# explicit mirroring for calc
inline void EnableMirroring() { maLBWindow.EnableMirroring(); }
inline void SetDropTraget(const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface i_xDNDListenerContainer){
mxDNDListenerContainer= i_xDNDListenerContainer; }
-
-virtual void take_properties(Window rOther);
};
// -
@@ -620,7 +611,6 @@ public:
sal_BoolIsUserDrawEnabled() const { return
mbUserDrawEnabled; }
voidDrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText,
sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false );
-virtual void take_properties(Window rOther);
};
// ---
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index fb47a0c..431d4bf 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -169,11 +169,6 @@ public:
}
OString get_by_window(const Window *pWindow) const;
void delete_by_window(const Window *pWindow);
-//for the purposes of retrofitting this to the existing code
-//look up sID, clone its properties into replacement and
-//splice replacement into the tree instead of it, without
-//taking ownership of it
-bool replace(OString sID, Window rReplacement);
private:
Window *insertObject(Window *pParent, const OString rClass, const OString
rID,
stringmap rProps, stringmap rPangoAttributes);
@@ -205,14 +200,12 @@ private:
PackingData get_window_packing_data(const Window *pWindow) const;
void
Re: Reworking the MSVC-related build options
Good evening Tor, all Le Tue, 04 Dec 2012 07:24:18 +0100, Tor Lillqvist t...@iki.fi a écrit: Does anybody use VS Express 2010? Me, me, me !!! :-) OK, will have to test with that, too, then... I could if you push a branch somewhere --dotnet-framework-home This one, because /lib/mscoree.lib is not where you expect it (In my case, in an SDK 6 subfolder) OK, still that should be automateable, I hope. Yes. I think it resolves to check for mscoree.lib in current Win SDK, then search in the other WinSDKs. --windows-sdk-home This one was required to use latest SDK with not latest VS, like VS2008 (which comes with SDK 6) and SDK 7.1 OK. But does one actually win anything by using a newer SDK than the one that cvame with the compiler, *when building LibreOffice*? (I used to have the 7.1 one myself, too, can't remember why. Anyway, it caused horrible problems when uninstalling and re-installing VS2010...) Well, as soon as you have more than one version of SDK, it could be a pain. --directx-home Well, you can find it in registry, but there is no standard variable that points to it. But oowintool manages to find it, so it can't be impossible? Or is that just some versions of the DirectX SDK? As the latest DirectX SDK seems to be the June 2010 one, isn't it, could one assume that everybody should have that by now? (Is that really the latest? Has that technology then been merged into something else SDK-wise?) oowintool provides nothing to this regard currently. We define the argument for it. I tried to find a way to find it, but found none. HTH -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Reworking the MSVC-related build options
--directx-home Well, you can find it in registry, but there is no standard variable that points to it. But oowintool manages to find it, s oowintool provides nothing to this regard currently Ah you are right. But configure.ac by default takes it from the environment, it claims A standard installation of the DirectX SDK sets $DXSDK_DIR. Is that not true then? You don't have that environment variable? It has always worked for me, I have never specified --directx-home... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Reworking the MSVC-related build options
Am 04.12.2012 21:16, schrieb Mat M: Le Tue, 04 Dec 2012 07:24:18 +0100, Tor Lillqvist t...@iki.fi a écrit: --directx-home Well, you can find it in registry, but there is no standard variable that points to it. But oowintool manages to find it, so it can't be impossible? Or is that just some versions of the DirectX SDK? As the latest DirectX SDK seems to be the June 2010 one, isn't it, could one assume that everybody should have that by now? No, you can't. One can only install DirectX SDK if windows is activated. So please don't break free tool chain on windows: * non activated windows * express VS (2008 and 2010 for now) * without 64 bit extension (non available on express version) * without DirectX SDK (Is that really the latest? Has that technology then been merged into something else SDK-wise?) oowintool provides nothing to this regard currently. We define the argument for it. I tried to find a way to find it, but found none. never used it actually. Thanks David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Reworking the MSVC-related build options
So please don't break free tool chain on windows: * non activated windows How does not activating your Windows installation reduce the purchase price of its license (if you mean free as in beer, or make it less proprietary (if you mean free as in speech)? Or what are you saying here? Or is non-activated an euphemism for pirated? I better get out of this discussion then before I say what I think. Let's forget this whole idea. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/qa sc/source
sc/inc/document.hxx | 13 -
sc/inc/globstr.hrc|5 -
sc/qa/unit/filters-test.cxx |2 ++
sc/qa/unit/subsequent_filters-test.cxx|2 ++
sc/source/core/data/documen2.cxx |1 +
sc/source/core/data/document.cxx | 10 ++
sc/source/filter/oox/workbookfragment.cxx | 29 +++--
sc/source/ui/docshell/docsh.cxx | 22 +-
sc/source/ui/docshell/externalrefmgr.cxx |1 +
sc/source/ui/src/globstr.src | 10 ++
10 files changed, 82 insertions(+), 13 deletions(-)
New commits:
commit 1732d9e96fc11417fb966f2127001711fa3af4f1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Dec 4 16:23:18 2012 -0500
Ask the user if she wants to do full recalc on load, for ods and xlsx
import.
But allow it to be disabled for filters tests as well as external document
loading.
Change-Id: I5b8533532c6be8b7c2cfcbe15faf780d621aec65
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a202a54..7986930 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -391,11 +391,12 @@ private:
mutable boolbStyleSheetUsageInvalid;
-boolmbUndoEnabled;
-boolmbAdjustHeightEnabled;
-boolmbExecuteLinkEnabled;
-boolmbChangeReadOnlyEnabled;// allow changes in
read-only document (for API import filters)
-boolmbStreamValidLocked;
+boolmbUndoEnabled:1;
+boolmbAdjustHeightEnabled:1;
+boolmbExecuteLinkEnabled:1;
+boolmbChangeReadOnlyEnabled:1;// allow changes in
read-only document (for API import filters)
+boolmbStreamValidLocked:1;
+boolmbUserInteractionEnabled:1; // whether or not to
launch any kind of interactive dialogs.
sal_Int16 mnNamedRangesLockCount;
@@ -996,6 +997,8 @@ public:
voidEnableExecuteLink( bool bVal ) {
mbExecuteLinkEnabled = bVal; }
boolIsChangeReadOnlyEnabled() const { return
mbChangeReadOnlyEnabled; }
voidEnableChangeReadOnly( bool bVal ) {
mbChangeReadOnlyEnabled = bVal; }
+SC_DLLPUBLIC bool IsUserInteractionEnabled() const;
+SC_DLLPUBLIC void EnableUserInteraction( bool bVal );
SC_DLLPUBLIC sal_Int16 GetNamedRangesLockCount() const {
return mnNamedRangesLockCount; }
voidSetNamedRangesLockCount( sal_Int16 nCount ) {
mnNamedRangesLockCount = nCount; }
SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const
ScMarkData* pMarks );
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 4fc17bd..3f23dc1 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -616,6 +616,9 @@
#define STR_ERR_CONDFORMAT_PROTECTED 491
-#define STR_COUNT 492
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 492
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 493
+
+#define STR_COUNT 494
#endif
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index b4a9fa1..060fbaa 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -156,7 +156,9 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
rFilter, const rtl::OUStr
pFilter-SetVersion(nFilterVersion);
ScDocShellRef xDocShRef = new ScDocShell;
+xDocShRef-GetDocument()-EnableUserInteraction(false);
SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
+pSrcMed-UseInteractionHandler(false);
pSrcMed-SetFilter(pFilter);
if (!xDocShRef-DoLoad(pSrcMed))
{
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index a72629a..d31bd8d 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -244,7 +244,9 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
rFilter, const rtl::OUStr
pFilter-SetVersion(nFilterVersion);
ScDocShellRef xDocShRef = new ScDocShell;
+xDocShRef-GetDocument()-EnableUserInteraction(false);
SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
+pSrcMed-UseInteractionHandler(false);
pSrcMed-SetFilter(pFilter);
if (!xDocShRef-DoLoad(pSrcMed))
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 58bfc9e..095b41a 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -205,6 +205,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
mbExecuteLinkEnabled( true ),
mbChangeReadOnlyEnabled( false ),
mbStreamValidLocked( false ),
+mbUserInteractionEnabled(true),
mnNamedRangesLockCount( 0 ),
mbIsInTest( false )
{
diff --git a/sc/source/core/data/document.cxx
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/inc sc/qa sc/source
sc/inc/document.hxx | 13 -
sc/inc/globstr.hrc|5 -
sc/qa/unit/filters-test.cxx |2 ++
sc/qa/unit/subsequent_filters-test.cxx|2 ++
sc/source/core/data/documen2.cxx |1 +
sc/source/core/data/document.cxx | 10 ++
sc/source/filter/oox/workbookfragment.cxx | 29 +++--
sc/source/ui/docshell/docsh.cxx | 22 +-
sc/source/ui/docshell/externalrefmgr.cxx |1 +
sc/source/ui/src/globstr.src | 10 ++
10 files changed, 82 insertions(+), 13 deletions(-)
New commits:
commit d5a9484304df0a4c4bdfd736176c087817a70265
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Dec 4 16:23:18 2012 -0500
Ask the user if she wants to do full recalc on load, for ods and xlsx
import.
But allow it to be disabled for filters tests as well as external document
loading.
Change-Id: I5b8533532c6be8b7c2cfcbe15faf780d621aec65
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a202a54..7986930 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -391,11 +391,12 @@ private:
mutable boolbStyleSheetUsageInvalid;
-boolmbUndoEnabled;
-boolmbAdjustHeightEnabled;
-boolmbExecuteLinkEnabled;
-boolmbChangeReadOnlyEnabled;// allow changes in
read-only document (for API import filters)
-boolmbStreamValidLocked;
+boolmbUndoEnabled:1;
+boolmbAdjustHeightEnabled:1;
+boolmbExecuteLinkEnabled:1;
+boolmbChangeReadOnlyEnabled:1;// allow changes in
read-only document (for API import filters)
+boolmbStreamValidLocked:1;
+boolmbUserInteractionEnabled:1; // whether or not to
launch any kind of interactive dialogs.
sal_Int16 mnNamedRangesLockCount;
@@ -996,6 +997,8 @@ public:
voidEnableExecuteLink( bool bVal ) {
mbExecuteLinkEnabled = bVal; }
boolIsChangeReadOnlyEnabled() const { return
mbChangeReadOnlyEnabled; }
voidEnableChangeReadOnly( bool bVal ) {
mbChangeReadOnlyEnabled = bVal; }
+SC_DLLPUBLIC bool IsUserInteractionEnabled() const;
+SC_DLLPUBLIC void EnableUserInteraction( bool bVal );
SC_DLLPUBLIC sal_Int16 GetNamedRangesLockCount() const {
return mnNamedRangesLockCount; }
voidSetNamedRangesLockCount( sal_Int16 nCount ) {
mnNamedRangesLockCount = nCount; }
SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const
ScMarkData* pMarks );
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 4fc17bd..3f23dc1 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -616,6 +616,9 @@
#define STR_ERR_CONDFORMAT_PROTECTED 491
-#define STR_COUNT 492
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 492
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 493
+
+#define STR_COUNT 494
#endif
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index b4a9fa1..060fbaa 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -156,7 +156,9 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
rFilter, const rtl::OUStr
pFilter-SetVersion(nFilterVersion);
ScDocShellRef xDocShRef = new ScDocShell;
+xDocShRef-GetDocument()-EnableUserInteraction(false);
SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
+pSrcMed-UseInteractionHandler(false);
pSrcMed-SetFilter(pFilter);
if (!xDocShRef-DoLoad(pSrcMed))
{
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index a72629a..d31bd8d 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -244,7 +244,9 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
rFilter, const rtl::OUStr
pFilter-SetVersion(nFilterVersion);
ScDocShellRef xDocShRef = new ScDocShell;
+xDocShRef-GetDocument()-EnableUserInteraction(false);
SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
+pSrcMed-UseInteractionHandler(false);
pSrcMed-SetFilter(pFilter);
if (!xDocShRef-DoLoad(pSrcMed))
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 58bfc9e..095b41a 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -205,6 +205,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
mbExecuteLinkEnabled( true ),
mbChangeReadOnlyEnabled( false ),
mbStreamValidLocked( false ),
+mbUserInteractionEnabled(true),
mnNamedRangesLockCount( 0 ),
mbIsInTest( false )
{
diff --git a/sc/source/core/data/document.cxx
disabling built-in rules in makefile
Hi, I've removed MAKEFLAGS+=-r in 0a45deba2be4a77db7540bd050b25bd6c26d7513 because I thought it's supposed to be used only for recursive make invocation. Now I see, it really makes a difference (for a reason unknown to me). It probably should be only MAKEFLAGS += r (there is no - in the variable if you use make -r) anyway.. using .SUFFIXES: makes even bigger difference for me. Then it's the ~same as using make -r. So, I suggest to do -MAKEFLAGS+=-r +.SUFFIXES: in gbuild.mk HTH, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
