LibreOffice Gerrit News 2013-08-26
Moin! * Open changes on master for project core changed in the last 25 hours: + Cross-platform libvlc loading. in https://gerrit.libreoffice.org/5627 from Minh Ngo + fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO in https://gerrit.libreoffice.org/5631 from Marcos Souza + Fix iterator management in https://gerrit.libreoffice.org/5629 from Julien Nabet + Simplify iterator management (part2) in https://gerrit.libreoffice.org/5628 from Julien Nabet + String to OUString, some cleanup in https://gerrit.libreoffice.org/5608 from Matteo Casalin + fix for text watermark in https://gerrit.libreoffice.org/5568 from Adam CloudOn * Merged changes on master for project core changed in the last 25 hours: + fdo#57950: Remove some chained appends in sw in https://gerrit.libreoffice.org/5602 from Jelle van der Waa + String to OUString in https://gerrit.libreoffice.org/5626 from Matteo Casalin + Use support function for name of services in https://gerrit.libreoffice.org/5624 from Matteo Casalin + vectorOUString* to vectorOUString as a temporary in https://gerrit.libreoffice.org/5623 from Matteo Casalin + String to OUString and some cleanup in https://gerrit.libreoffice.org/5618 from Matteo Casalin + String to OUString and hide implementation details in https://gerrit.libreoffice.org/5617 from Matteo Casalin + String to OUString + missing SetText in https://gerrit.libreoffice.org/5616 from Matteo Casalin + SwGlTreeListBox: NotifyCoping and NotifyMoving almost equal in https://gerrit.libreoffice.org/5615 from Matteo Casalin + Reduce getToken load by using nIndex in https://gerrit.libreoffice.org/5614 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5613 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5612 from Matteo Casalin + Improve description in https://gerrit.libreoffice.org/5611 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5610 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5609 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5625 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5620 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5622 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5621 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5619 from Matteo Casalin + String to OUString in https://gerrit.libreoffice.org/5607 from Matteo Casalin * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn + fdo#66577: non-fractional widths with Core Text in https://gerrit.libreoffice.org/5023 from Khaled Hosny + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + fdo#67104: Default value of 'Show cell grid lines' checkbox on sidebar in https://gerrit.libreoffice.org/5260 from Prashant Pandey + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + Icons Texts per toolbar in 'Customize' Toolbars in https://gerrit.libreoffice.org/5125 from Prashant Pandey + Math Embedded Fonts: Added Font tab to document... in https://gerrit.libreoffice.org/4931 from Marcos Souza + fdo#66279 - MathML export: use the operator dictionary in https://gerrit.libreoffice.org/4671 from Frédéric Wang + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/uunxapi.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 847d60c4525a81c1c299e3b318c0552b2616f49b
Author: Tor Lillqvist t...@iki.fi
Date: Mon Aug 26 09:03:17 2013 +0300
Use strncmp()
Change-Id: I593ce24ce83cd3034d23297adc3de5f6de18f3a9
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 866cef2..316f75a 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -272,8 +272,7 @@ int open_c(const char *cpPath, int oflag, int mode)
// scoped bookmark for it so that we can access the file in
// the future, too. (For the Recent Files functionality.)
const char *sandbox = [NSHomeDirectory() UTF8String];
-if (!(strlen(cpPath) strlen(sandbox)
- memcmp(sandbox, cpPath, strlen(sandbox)) == 0
+if (!(strncmp(sandbox, cpPath, strlen(sandbox)) == 0
cpPath[strlen(sandbox)] == '/'))
{
NSURL *url = [NSURL fileURLWithPath:[NSString
stringWithUTF8String:cpPath]];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source scp2/source
desktop/source/app/langselect.cxx | 70 --
scp2/source/ooo/common_brand.scp | 14 ---
2 files changed, 84 deletions(-)
New commits:
commit 3162d9d430a32c0d51f3d1f0cac3e22f66ae43f2
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Aug 24 17:28:55 2013 +0200
Remove unused STARTLANG feature
Change-Id: Ib33f2ba2541faad24779cfdfbff7cf7f8a960af2
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index d701ee4..5fc4bc2 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -24,10 +24,6 @@
#include stdio.h
#include rtl/string.hxx
-#include rtl/bootstrap.hxx
-#include unotools/pathoptions.hxx
-#include tools/resid.hxx
-#include tools/config.hxx
#include i18nlangtag/mslangid.hxx
#include i18nlangtag/languagetag.hxx
#include comphelper/processfactory.hxx
@@ -41,8 +37,6 @@
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/util/XFlushable.hpp
#include rtl/instance.hxx
-#include osl/process.h
-#include osl/file.hxx
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -53,48 +47,10 @@ using namespace com::sun::star::util;
namespace desktop {
-static char const SOFFICE_BOOTSTRAP[] = Bootstrap;
-static char const SOFFICE_STARTLANG[] = STARTLANG;
-
sal_Bool LanguageSelection::bFoundLanguage = sal_False;
OUString LanguageSelection::aFoundLanguage;
LanguageSelection::LanguageSelectionStatus LanguageSelection::m_eStatus =
LS_STATUS_OK;
-static sal_Bool existsURL( OUString const sURL )
-{
-using namespace osl;
-DirectoryItem aDirItem;
-
-if (!sURL.isEmpty())
-return ( DirectoryItem::get( sURL, aDirItem ) == DirectoryItem::E_None
);
-
-return sal_False;
-}
-
-// locate soffice.ini/.rc file
-static OUString locateSofficeIniFile()
-{
-OUString aUserDataPath;
-OUString aSofficeIniFileURL;
-
-// Retrieve the default file URL for the soffice.ini/rc
-rtl::Bootstrap().getIniName( aSofficeIniFileURL );
-
-if ( utl::Bootstrap::locateUserData( aUserDataPath ) ==
utl::Bootstrap::PATH_EXISTS )
-{
-sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/');
-if ( nIndex 0 )
-{
-OUString aUserSofficeIniFileURL = aUserDataPath + /config +
aSofficeIniFileURL.copy( nIndex );
-
-if ( existsURL( aUserSofficeIniFileURL ))
-return aUserSofficeIniFileURL;
-}
-}
-// Fallback try to use the soffice.ini/rc from program folder
-return aSofficeIniFileURL;
-}
-
bool LanguageSelection::prepareLanguage()
{
m_eStatus = LS_STATUS_OK;
@@ -136,7 +92,6 @@ bool LanguageSelection::prepareLanguage()
// get the selected UI language as string
bool bCmdLanguage( false );
-bool bIniLanguage( false );
OUString aLocaleString = getUserUILanguage();
if ( aLocaleString.isEmpty() )
@@ -153,23 +108,6 @@ bool LanguageSelection::prepareLanguage()
}
else
aLocaleString = aEmpty;
-
-if ( !bCmdLanguage )
-{
-OUString aSOfficeIniURL = locateSofficeIniFile();
-Config aConfig(aSOfficeIniURL);
-aConfig.SetGroup( SOFFICE_BOOTSTRAP );
-OString sLang = aConfig.ReadKey( SOFFICE_STARTLANG );
-aLocaleString = OUString( sLang.getStr(), sLang.getLength(),
RTL_TEXTENCODING_ASCII_US );
-if (isInstalledLanguage(aLocaleString, sal_False))
-{
-bIniLanguage = true;
-bFoundLanguage = true;
-aFoundLanguage = aLocaleString;
-}
-else
-aLocaleString = aEmpty;
-}
}
// user further fallbacks for the UI language
@@ -194,14 +132,6 @@ bool LanguageSelection::prepareLanguage()
Reference XChangesBatch (xProp,
UNO_QUERY_THROW)-commitChanges();
}
-if ( bIniLanguage )
-{
-// Store language only
-Reference XPropertySet
xProp2(getConfigAccess(org.openoffice.Office.Linguistic/General/, sal_True),
UNO_QUERY_THROW);
-xProp2-setPropertyValue(UILocale, makeAny(aLocaleString));
-Reference XChangesBatch (xProp2,
UNO_QUERY_THROW)-commitChanges();
-}
-
MsLangId::setConfiguredSystemUILanguage(
aUILanguageTag.getLanguageType( false) );
OUString sLocale;
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 665b8bf..3dedd0b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -939,20 +939,6 @@ ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
Value = 1;
End
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Soffice_Startlang
-ProfileID = gid_Brand_Profile_Soffice_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = Bootstrap;
-Order = 8;
-Key = STARTLANG;
-Value =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f49fe61a53a00cca0415e1f53bded791d2078a44 Author: Andras Timar ati...@suse.com Date: Mon Aug 26 08:33:54 2013 +0200 Updated core Project: translations 0abb85f959149ee831719d944cb2a834e971 diff --git a/translations b/translations index 6d19b6d..0abb85f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6d19b6dbcd66a36cfe3e61833d8d2499b1c27ce6 +Subproject commit 0abb85f959149ee831719d944cb2a834e971 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f353a0ae39631bc81e2865a14805e3f5f5f5498 Author: Andras Timar ati...@suse.com Date: Mon Aug 26 08:33:54 2013 +0200 Updated core Project: translations c1cc180bf7eef188402e1fe02e1a134244a1993d diff --git a/translations b/translations index 2aeef1e..c1cc180 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2aeef1e101f95039d4927e362bc0d0a32a68b6ba +Subproject commit c1cc180bf7eef188402e1fe02e1a134244a1993d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDSVGGenerator.cpp | 36 ++--
1 file changed, 10 insertions(+), 26 deletions(-)
New commits:
commit 5dba994102a251554b97f2d8dc5d08021d99f475
Author: Laurent Alonso laurent.alo...@inria.fr
Date: Mon Aug 26 09:50:05 2013 +0200
Fix dasharray
diff --git a/src/lib/VSDSVGGenerator.cpp b/src/lib/VSDSVGGenerator.cpp
index 1dda1ed..a133571 100644
--- a/src/lib/VSDSVGGenerator.cpp
+++ b/src/lib/VSDSVGGenerator.cpp
@@ -467,58 +467,42 @@ void VSDSVGGeneratorPrivate::writeStyle(bool /* isClosed
*/)
int dots1 = m_style[draw:dots1] ? m_style[draw:dots1]-getInt() : 0;
int dots2 = m_style[draw:dots2] ? m_style[draw:dots2]-getInt() : 0;
double dots1len = 72.*width, dots2len = 72.*width, gap = 72.*width;
-std::string dots1lenUnit=, dots2lenUnit=, gapUnit=;
if (m_style[draw:dots1-length])
{
- dots1len = m_style[draw:dots1-length]-getDouble();
+ dots1len = 72.*m_style[draw:dots1-length]-getDouble();
std::string str = m_style[draw:dots1-length]-getStr().cstr();
if (str.size() 1 str[str.size()-1]=='%')
- {
-dots1len *=100.;
-dots1lenUnit=%;
- }
- else
-dots1len *=72.;
+dots1len *=width;
}
if (m_style[draw:dots2-length])
{
- dots2len = m_style[draw:dots2-length]-getDouble();
+ dots2len = 72.*m_style[draw:dots2-length]-getDouble();
std::string str = m_style[draw:dots2-length]-getStr().cstr();
if (str.size() 1 str[str.size()-1]=='%')
- {
-dots2len *=100.;
-dots2lenUnit=%;
- }
- else
-dots2len *=72.;
+dots2len *=width;
}
if (m_style[draw:distance])
{
- gap = m_style[draw:distance]-getDouble();
+ gap = 72.*m_style[draw:distance]-getDouble();
std::string str = m_style[draw:distance]-getStr().cstr();
if (str.size() 1 str[str.size()-1]=='%')
- {
-gap *=100.;
-gapUnit=%;
- }
- else
-gap *=72.;
+gap *=width;
}
m_outputSink stroke-dasharray: ;
for (int i = 0; i dots1; i++)
{
if (i)
m_outputSink , ;
- m_outputSink doubleToString(dots1len) dots1lenUnit;
+ m_outputSink doubleToString(dots1len);
m_outputSink , ;
- m_outputSink doubleToString(gap) gapUnit;
+ m_outputSink doubleToString(gap);
}
for (int j = 0; j dots2; j++)
{
m_outputSink , ;
- m_outputSink doubleToString(dots2len) dots2lenUnit;
+ m_outputSink doubleToString(dots2len);
m_outputSink , ;
- m_outputSink doubleToString(gap) gapUnit;
+ m_outputSink doubleToString(gap);
}
m_outputSink ; ;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 587b8034d3b53ffd28b80261683713ae0b1bab47 Author: Andras Timar ati...@suse.com Date: Mon Aug 26 09:43:08 2013 +0200 Updated core Project: translations 0bdd23ed769be53974c9f545b70fe9de1d1bec7d diff --git a/translations b/translations index abfb59b..0bdd23e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit abfb59b2b1a2f2c9c7360e7aafb957de9390aae7 +Subproject commit 0bdd23ed769be53974c9f545b70fe9de1d1bec7d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx
vcl/unx/generic/app/saldata.cxx | 25 +++--
vcl/unx/gtk/app/gtkdata.cxx | 12 +---
2 files changed, 16 insertions(+), 21 deletions(-)
New commits:
commit 8ea056e716d87c07343adc8532ce6f265de13624
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 23 12:03:45 2013 +0200
rhbz#1000150: Do not call exit upon XIOError
...as done in _XIOError (libX11-1.6.0/src/XlibInt.c) after calling the
XIOError
handler function (either the one supplied with XSetIOErrorHandler or
_XDefaultIOError), as that calls the atexit handlers, which can wreak havoc
in
unrelated threads that happen to be running in parallel, leading to
arbitrary
crashes. So avoid that by always calling _exit already from our XIOError
handler.
The old code was careful to /not/ call _exit when the XIOError happened on
any
thread but the main one, but I do not see the sense of that---after all,
_XIOError will inevitably call exit afterwards, so this cannot be a way to
ignore XIOErrors from special threads (that are set up say for the sole
purpose of trying out known-shaky activities without affecting the
stability
of the whole process). And findings like comment 12 to
https://bugzilla.redhat.com/show_bug.cgi?id=831628#c12 [abrt]
libreoffice-core-3.5.4.2-1.fc17: ICEConnectionWorker thread still running
during
exit (it is very likely that this is not a normal exit from reaching the
end
of main, but rather some explicit call to exit from some error handling
code)
make it clear that we apparenly do suffer from such calls to _XIOError -
exit
on non-main threads.
I have no idea why vcl/unx/gtk has its own XIOErrorHdl that is substantially
different from the vcl/unx/generic one, though.
cherry picked from commit ffea65915b9cc6d4f3c01f829552702654a040f9, plus
follow-up b240a1c188b58e3e717335339bfc3f5e20bb2bf4:
rhbz#1000150: Do not call exit upon XIOError, take two
The _XDefaultIOError handler (libX11-1.6.0/src/XlibInt.c) already calls
exit
(even though _XIOError calling _XDefaultIOError would call exit
afterwards,
too), so our XIOError handler must not call aOrigXIOErrorHandler.
Change-Id: Ida7d407cf5f0fa4e719118cab5e725144ceb3a35
Reviewed-on: https://gerrit.libreoffice.org/5596
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index f02a25b..9b1b9de 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -313,22 +313,19 @@ int X11SalData::XErrorHdl( Display *pDisplay, XErrorEvent
*pEvent )
int X11SalData::XIOErrorHdl( Display * )
{
-if (::osl::Thread::getCurrentIdentifier() !=
Application::GetMainThreadIdentifier())
+if (::osl::Thread::getCurrentIdentifier() ==
Application::GetMainThreadIdentifier())
{
-pthread_exit(NULL);
-return 0;
+/* #106197# hack: until a real shutdown procedure exists
+ * _exit ASAP
+ */
+if( ImplGetSVData()-maAppData.mbAppQuit )
+_exit(1);
+
+// really bad hack
+if( ! SessionManagerClient::checkDocumentsSaved() )
+/* oslSignalAction eToDo = */ osl_raiseSignal
(OSL_SIGNAL_USER_X11SUBSYSTEMERROR, NULL);
}
-/* #106197# hack: until a real shutdown procedure exists
- * _exit ASAP
- */
-if( ImplGetSVData()-maAppData.mbAppQuit )
-_exit(1);
-
-// really bad hack
-if( ! SessionManagerClient::checkDocumentsSaved() )
-/* oslSignalAction eToDo = */ osl_raiseSignal
(OSL_SIGNAL_USER_X11SUBSYSTEMERROR, NULL);
-
std::fprintf( stderr, X IO Error\n );
std::fflush( stdout );
std::fflush( stderr );
@@ -337,7 +334,7 @@ int X11SalData::XIOErrorHdl( Display * )
* do apply here. Since there is nothing to be done after an XIO
* error we have to _exit immediately.
*/
-_exit(0);
+_exit(1);
return 0;
}
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 14a1949..2f7cc3f 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -519,14 +519,12 @@ GtkData::GtkData( SalInstance *pInstance )
XIOErrorHandler aOrigXIOErrorHandler = NULL;
-int XIOErrorHdl(Display *pDisplay)
+int XIOErrorHdl(Display *)
{
-if (::osl::Thread::getCurrentIdentifier() !=
Application::GetMainThreadIdentifier())
-{
-pthread_exit(NULL);
-return 0;
-}
-return aOrigXIOErrorHandler ? aOrigXIOErrorHandler(pDisplay) : 0;
+fprintf(stderr, X IO Error\n);
+_exit(1);
+// avoid crashes in unrelated threads that still run while atexit
+// handlers are in progress
}
GtkData::~GtkData()
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/vlc/vlcframegrabber.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 170b1c663e2d65b06f9328f8268fac4a580dd570 Author: Michael Meeks michael.me...@suse.com Date: Mon Aug 26 09:50:32 2013 +0100 avmedia - vlc: include iostream Change-Id: I94cec00f12dd4287980e74ad984518faedc4bae3 diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 4ccb8fa..a90a908 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -1,4 +1,5 @@ #include boost/bind.hpp +#include iostream #include osl/conditn.hxx #include vcl/graph.hxx #include vcl/bmpacc.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/inc
scp2/inc/macros.inc |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit c8b6437fb60e0428d615ca5c4b532f79b721785a Author: Jesús Corrius jcorr...@gmail.com Date: Sat Aug 24 13:55:46 2013 +0200 Create the AppUserModelID registry values correctly This commit is a backport from master. The original code is totally broken and creates useless registry values in a wrong place. The corrected patch allows LO to keep track of the MSO file types opened by our application in the shell's recent documents list. Change-Id: I5db0a7f166ef73fe21a5f3fc891f86a91e1914d5 Reviewed-on: https://gerrit.libreoffice.org/5603 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index fa7c350..f0ed12a2 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -236,11 +236,12 @@ End End #define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ -RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = VersionNT = 600; \ -Subkey = STRING(AppUserModelID); \ +ComponentCondition = STRING(VersionNT = 601); \ +Subkey = STRING(CONCAT2(LibreOffice.,name)); \ +Name = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Library.mk | 17 - solenv/gbuild/Package.mk | 10 +- 2 files changed, 25 insertions(+), 2 deletions(-) New commits: commit ee4d7829b7f5c07bd0b46dedc9436c83c7dc17ef Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Aug 23 10:52:46 2013 +0200 introduce gb_Package_PRESTAGEDIR this introduces a prestage dir -- if a file can be found in that directory, it will be copied over instead of build. Usecases for this include: - split builds: e.g. a part of the LibreOffice gets build by a core package and writer or calc package then only builds the additional missing pieces (while copying existing files from the earlier package build) please not this does not intend to produce separately installable instances, only to generate the build in multiple steps, to: - reduce filesystem usage of one build - paralellisation: e.g. writer and calc could build at the same time on two builders - restart capability: e.g. if a build breaks in writer, no need to rebuild everything (relevant for slow and somewhat more flaky platforms like arm) - staged single build: on a filesystem restrained builder, keeping all the objects around for the build can be a burden. With this, such builders can do a partial build (lets say: make svx), put the instdir aside, make clean and continue -- but without needing to keep space for the object files of the build up to svx. It need gb_RUNNABLE_INSTDIR -- we are going there anyway, no need to support other scenarios. This needs more dependency breaking for most scenarios but a: export gb_RUNNABLE_INSTDIR=T make cp -a instdir instdir_prestage make clean make sw.all make sw.clean export gb_Package_PRESTAGEDIR=`readlink -f instdir_prestage/unxlngx6.pro` cd sw make build # this does no compiles, it just copies Change-Id: I22d4208b2fad0d8fc59426ba4c8c52122876f646 Reviewed-on: https://gerrit.libreoffice.org/5591 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 17163a1..e8cd313 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -55,10 +55,24 @@ $$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Librar $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk)) endif $(call gb_Library_get_target,$(1)) : SOVERSION := -$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1))) + +$(if $(gb_Package_PRESTAGEDIR),\ +$(if $(wildcard $(gb_Package_PRESTAGEDIR)/$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))),\ +$(call gb_Library__Library_impl_copy,$(0),$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))),\ +$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))\ +), +$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))\ +) endef +define gb_Library__Library_impl_copy +$(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR)) +$(call gb_Package_set_outdir,Library_Copy_$(1),$(INSTDIR)) +$(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2)) +$(OUTDIR)/lib/$(notdir $(2)) : $(INSTDIR)/$(2) +endef + define gb_Library__Library_impl $(call gb_LinkTarget_LinkTarget,$(2),Library_$(1)) $(call gb_LinkTarget_set_targettype,$(2),Library) @@ -80,6 +94,7 @@ $(if $(filter $(call gb_Library_get_layer,$(1)):%,$(gb_Library_LAYER_DIRS)),\ endif $$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1 + $(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library__get_final_target,$(1))) $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 52f82f1..2a1fd53 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -49,7 +49,15 @@ $(OUTDIR)/inc/% : define gb_PackagePart_PackagePart $(4)/$(1) : $(2) | $(dir $(4)/$(1)).dir $(2) :| $(3) -$(call gb_Deliver_add_deliverable,$(4)/$(1),$(2),$(3)) + +$(if $(gb_Package_PRESTAGEDIR),\ + $(if $(wildcard $(gb_Package_PRESTAGEDIR)/$(1)),\ + $(call gb_Deliver_add_deliverable,$(4)/$(1),$(gb_Package_PRESTAGEDIR)/$(1),$(3)),\ + $(call gb_Deliver_add_deliverable,$(4)/$(1),$(2),$(3)) \ + ),\ + $(call gb_Deliver_add_deliverable,$(4)/$(1),$(2),$(3)) \ +) + endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[PUSHED] introduce gb_Package_PRESTAGEDIR
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5591 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5591 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22d4208b2fad0d8fc59426ba4c8c52122876f646 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/extinput.hxx |8 +--
sw/source/core/doc/extinput.cxx | 106 +---
2 files changed, 62 insertions(+), 52 deletions(-)
New commits:
commit 808d3c669c4c49c2dd5ea7fad7841378b5cc2f8c
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Thu Aug 22 08:11:10 2013 +0200
String to OUString, some cleanup
Change-Id: I7d1cdabdaecae1d993730397a1757727fb40a6db
Reviewed-on: https://gerrit.libreoffice.org/5608
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index f4d9990..7b760e9 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _EXTINPUT_HXX
-#define _EXTINPUT_HXX
+#ifndef EXTINPUT_HXX
+#define EXTINPUT_HXX
#include pam.hxx
#include i18nlangtag/lang.h
@@ -28,7 +28,7 @@ class CommandExtTextInputData;
class SwExtTextInput : public SwPaM
{
std::vectorsal_uInt16 aAttrs;
-String sOverwriteText;
+OUString sOverwriteText;
sal_Bool bInsText : 1;
sal_Bool bIsOverwriteCursor : 1;
LanguageType eInputLanguage;
@@ -44,6 +44,6 @@ public:
void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;}
};
-#endif //_EXTINPUT_HXX
+#endif //EXTINPUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 3879776..f997ba7 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include algorithm
+
#include com/sun/star/i18n/ScriptType.hpp
#include editeng/langitem.hxx
@@ -59,7 +61,7 @@ SwExtTextInput::~SwExtTextInput()
{
if( nEndCnt nSttCnt )
{
-xub_StrLen n = nEndCnt; nEndCnt = nSttCnt; nSttCnt = n;
+std::swap(nSttCnt, nEndCnt);
}
// In order to get Undo/Redlining etc. working correctly,
@@ -83,34 +85,29 @@ SwExtTextInput::~SwExtTextInput()
}
}
rIdx = nSttCnt;
-String sTxt( pTNd-GetTxt().copy(nSttCnt, nEndCnt - nSttCnt));
-if( bIsOverwriteCursor sOverwriteText.Len() )
+const OUString sTxt( pTNd-GetTxt().copy(nSttCnt, nEndCnt -
nSttCnt));
+if( bIsOverwriteCursor !sOverwriteText.isEmpty() )
{
-xub_StrLen nLen = sTxt.Len();
-if( nLen sOverwriteText.Len() )
+const sal_Int32 nLen = sTxt.getLength();
+const sal_Int32 nOWLen = sOverwriteText.getLength();
+if( nLen nOWLen )
{
-rIdx += sOverwriteText.Len();
-pTNd-EraseText( rIdx, nLen - sOverwriteText.Len() );
+rIdx += nOWLen;
+pTNd-EraseText( rIdx, nLen - nOWLen );
rIdx = nSttCnt;
-pTNd-ReplaceText( rIdx, sOverwriteText.Len(),
-sOverwriteText );
+pTNd-ReplaceText( rIdx, nOWLen, sOverwriteText );
if( bInsText )
{
rIdx = nSttCnt;
-pDoc-GetIDocumentUndoRedo().StartUndo(
-UNDO_OVERWRITE, NULL );
-pDoc-Overwrite( *this, sTxt.Copy( 0,
-sOverwriteText.Len() ));
-pDoc-InsertString( *this,
-sTxt.Copy( sOverwriteText.Len() ) );
-pDoc-GetIDocumentUndoRedo().EndUndo(
-UNDO_OVERWRITE, NULL );
+pDoc-GetIDocumentUndoRedo().StartUndo(
UNDO_OVERWRITE, NULL );
+pDoc-Overwrite( *this, sTxt.copy( 0, nOWLen ) );
+pDoc-InsertString( *this, sTxt.copy( nOWLen ) );
+pDoc-GetIDocumentUndoRedo().EndUndo( UNDO_OVERWRITE,
NULL );
}
}
else
{
-pTNd-ReplaceText( rIdx, nLen,
-sOverwriteText.Copy( 0, nLen ));
+pTNd-ReplaceText( rIdx, nLen, sOverwriteText.copy( 0,
nLen ));
if( bInsText )
{
rIdx = nSttCnt;
@@ -140,35 +137,41 @@ void SwExtTextInput::SetInputData( const
CommandExtTextInputData rData )
nEndCnt = GetMark()-nContent.GetIndex();
if( nEndCnt nSttCnt )
{
-xub_StrLen n = nEndCnt; nEndCnt = nSttCnt; nSttCnt = n;
+std::swap(nSttCnt, nEndCnt);
}
SwIndex aIdx(
[Libreoffice-commits] core.git: 2 commits - filter/source include/filter sw/CppunitTest_sw_ooxmlexport.mk sw/qa sw/source writerfilter/source
filter/source/msfilter/util.cxx | 19 +
include/filter/msfilter/util.hxx |7
sw/CppunitTest_sw_ooxmlexport.mk |1
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 14 +
sw/source/filter/ww8/docxattributeoutput.cxx | 31 ++
sw/source/filter/ww8/docxattributeoutput.hxx |7
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 28 ++-
7 files changed, 83 insertions(+), 24 deletions(-)
New commits:
commit e9275c08acc2f4f1c925f78b56a1089515cd9a37
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Aug 26 11:35:48 2013 +0200
bnc#834035 DOCX export: fix hyperlinks of illustration index
We used to export raw Writer bookmarks, but that's not valid in OOXML.
Instead, it has normal bookmarks around the sequence fields, so use them
if they are available.
Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index e96961f..2e90bec 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
ucb/source/ucp/file/ucpfile1 \
unotools/util/utl \
unoxml/source/service/unoxml \
+ uui/util/uui \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d5cb1cb..e4347dd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -112,6 +112,7 @@ public:
void testFdo44689_start_page_7();
void testFdo67737();
void testTransparentShadow();
+void testBnc834035();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -200,6 +201,7 @@ void Test::run()
{fdo44689_start_page_7.docx, Test::testFdo44689_start_page_7},
{fdo67737.docx, Test::testFdo67737},
{transparent-shadow.docx, Test::testTransparentShadow},
+{bnc834035.odt, Test::testBnc834035},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1233,6 +1235,18 @@ void Test::testTransparentShadow()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x7f808080), aShadow.Color);
}
+void Test::testBnc834035()
+{
+// This is tricky, when saving manually, there are 2 hyperlinks, here only
+// one, no idea why. That one still shows that we're not using bookmarks,
though.
+
+// Illustration index had wrong hyperlinks: anchor was using Writer's
+// seqname!index|sequence syntax, not a bookmark name.
+xmlDocPtr pXmlDoc = parseExport();
+// This was Figure!1|sequence.
+assertXPath(pXmlDoc, /w:document/w:body/w:p/w:hyperlink, anchor,
_Toc363553908);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5fa9713..2cf7058 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -706,6 +706,7 @@ void DocxAttributeOutput::DoWriteBookmarks()
FSNS( XML_w, XML_id ), OString::number( nId ).getStr( ),
FSNS( XML_w, XML_name ), rName.getStr(),
FSEND );
+m_sLastOpenedMark = rName;
}
m_rMarksStart.clear();
@@ -835,6 +836,12 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos
rInfos, bool bWriteRun )
void DocxAttributeOutput::DoWriteCmd( String rCmd )
{
+OUString sCmd = OUString(rCmd).trim();
+if (sCmd.startsWith(SEQ))
+{
+OUString sSeqName = msfilter::util::findQuotedText(sCmd, SEQ ,
'\\').trim();
+m_aSeqMarksNames[sSeqName].push_back(m_sLastOpenedMark);
+}
// Write the Field command
m_pSerializer-startElementNS( XML_w, XML_instrText, FSEND );
m_pSerializer-writeEscaped( OUString( rCmd ) );
@@ -1309,8 +1316,32 @@ bool DocxAttributeOutput::StartURL( const String rUrl,
const String rTarget )
m_pHyperlinkAttrList-add( FSNS( XML_r, XML_id), sId.getStr());
}
else
+{
+// Is this a link to a sequence? Then try to replace that with a
+// normal bookmark, as Word won't understand our special
+// seqname!index|sequence syntax.
+if (sMark.endsWith(|sequence))
+{
+sal_Int32 nPos = sMark.indexOf('!');
+if (nPos != -1)
+{
+// Extract seqname, the field instruction text has the
name quoted.
+OUString aSequenceName = OUString('') + sMark.copy(0,
nPos) + OUString('');
+// Extract index.
+sal_uInt32 nIndex = sMark.copy(nPos + 1, sMark.getLength()
- nPos - sizeof(|sequence)).toInt32();
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ac/ad1fbe75ca9e534ed1001cd7aa930e57e22048
ac/ad1fbe75ca9e534ed1001cd7aa930e57e22048 |1 + 1 file changed, 1 insertion(+) New commits: commit 08f7bd4d862314ef0301700598440accb407ae2e Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 26 12:37:48 2013 +0100 Notes added by 'git notes add' diff --git a/ac/ad1fbe75ca9e534ed1001cd7aa930e57e22048 b/ac/ad1fbe75ca9e534ed1001cd7aa930e57e22048 new file mode 100644 index 000..2420745 --- /dev/null +++ b/ac/ad1fbe75ca9e534ed1001cd7aa930e57e22048 @@ -0,0 +1 @@ +prefer: 55920ce3e85c91f25d2ca8cf92b8a48f3fad04e3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/bnc834035.odt |binary 1 file changed New commits: commit 8f146a8042dd8f3c88f39f8317372cd9c02ce4ad Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 26 13:39:20 2013 +0200 bnc#834035 test file Change-Id: I8416d663e573237a7b5a55545e630e5cbfdca25c diff --git a/sw/qa/extras/ooxmlexport/data/bnc834035.odt b/sw/qa/extras/ooxmlexport/data/bnc834035.odt new file mode 100644 index 000..393c960 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc834035.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit migration
Hi, Bjoern Michaelsen wrote on 2013-07-18 15:26: So, I did a quick check of basic operations: just a quick update - I'm back from vacation since Tuesday, but Robert is now away for another 1,5 weeks. I'll try to get the thing done when he has returned, and ping you then. :) Unless it's extremely urgent, I prefer to way for him, as he has more in-detail Gerrit experience than I have, so he can fix things onsite. Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 65f8980f2d58f8f2f74dd19d386a36ce54fb5aed Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 26 12:55:01 2013 +0100 Updated core Project: help 3bb6a44f94e5fa896748085a54f91f4ecffacc38 diff --git a/helpcontent2 b/helpcontent2 index cd613f0..3bb6a44 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cd613f0ea88364547616207dcc8a44bc65fbbae8 +Subproject commit 3bb6a44f94e5fa896748085a54f91f4ecffacc38 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst| 38 - source/text/swriter/01/04120220.xhp |4 +- source/text/swriter/01/04120221.xhp | 54 +--- source/text/swriter/01/04120222.xhp | 22 +++--- source/text/swriter/01/04120227.xhp | 42 ++-- 5 files changed, 60 insertions(+), 100 deletions(-) New commits: commit 3bb6a44f94e5fa896748085a54f91f4ecffacc38 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 26 12:55:01 2013 +0100 update help ids for toc entries page .ui conversion Change-Id: Id43cdcb4f278dfb7891b6233e43d4d1987b70219 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index a510b10..e81e9d7 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2219,7 +2219,6 @@ HID_INSERT_CHART,52971, HID_INSERT_CTRL,52822, HID_INSERT_FIELD_CTRL,52824, HID_INSERT_FILE,54077, -HID_INSERT_INDEX_ENTRY_LEVEL_LB,54914, HID_INSWIN_CALC,58769, HID_INSWIN_CANCEL,58770, HID_INSWIN_FUNC,58773, @@ -3743,7 +3742,6 @@ HID_TLB_RELATIONDESIGN,38921, HID_TLB_TABBROWSER,38790, HID_TLB_TABLEDESIGN,38891, HID_TLB_TREELISTBOX,38791, -HID_TOKEN_WINDOW,54879, HID_TOX_ENTRY_BUTTON,54856, HID_TOX_ENTRY_EDIT,54857, HID_TPCOLOR_CMYK_1,33895, @@ -3757,7 +3755,6 @@ HID_TPPOSITION_CTRL,33992, HID_TPSHADOW_CTRL,33990, HID_TPSIZE_CTRL,33993, HID_TP_CUSTOMPROPERTIES,33392, -HID_TP_TOX_ENTRY,53240, HID_TP_TOX_SELECT,53239, HID_TXTFOOTER,41145, HID_TXTSENDERCITY,41141, @@ -7359,10 +7356,6 @@ sw_CheckBox_TP_TABLE_TEXTFLOW_CB_KEEP,878511248, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_PAGEBREAK,878511235, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_PAGECOLL,878511240, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_SPLIT,878511249, -sw_CheckBox_TP_TOX_ENTRY_CB_ALPHADELIM,879150138, -sw_CheckBox_TP_TOX_ENTRY_CB_AUTORIGHT,879150133, -sw_CheckBox_TP_TOX_ENTRY_CB_COMMASEPARATED,879150139, -sw_CheckBox_TP_TOX_ENTRY_CB_RELTOSTYLE,879150134, sw_CheckBox_TP_TOX_SELECT_CB_ADDSTYLES,879133709, sw_CheckBox_TP_TOX_SELECT_CB_CASESENSITIVE,879133721, sw_CheckBox_TP_TOX_SELECT_CB_COLLECTSAME,879133719, @@ -7382,7 +7375,6 @@ sw_CheckBox_TP_TOX_SELECT_CB_USEFF,879133720, sw_CheckBox_TP_TOX_SELECT_CB_USE_DASH,879133729, sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087, sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, -sw_ComboBox_TP_TOX_ENTRY_CB_FILLCHAR,879153198, sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626, sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700, sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698, @@ -7429,14 +7421,6 @@ sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596, sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627, sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_DOWN,888499833, sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832, -sw_ImageButton_TP_TOX_ENTRY_WIN_TOKEN_WIN_LEFT_SCROLL,537456193, -sw_ImageButton_TP_TOX_ENTRY_WIN_TOKEN_WIN_RIGHT_SCROLL,537456195, -sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTDOWN1,879157900, -sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTDOWN2,879157901, -sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTDOWN3,879157902, -sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTUP1,879157897, -sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTUP2,879157898, -sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTUP3,879157899, sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_DBFMT_FROM_USR,1435045390, sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_DB_PARA_COLL,1435045395, sw_ListBox_DLG_AP_INSERT_DB_SEL_LB_TABLE_COL,1435045402, @@ -7479,14 +7463,6 @@ sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260, sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801, sw_ListBox_TP_TABLE_TEXTFLOW_LB_TEXTORIENTATION,878513708, sw_ListBox_TP_TABLE_TEXTFLOW_LB_VERTORIENT,878513815, -sw_ListBox_TP_TOX_ENTRY_LB_AUTHFIELD,879152759, -sw_ListBox_TP_TOX_ENTRY_LB_CHAPTERENTRY,879152688, -sw_ListBox_TP_TOX_ENTRY_LB_CHARSTYLE,879152683, -sw_ListBox_TP_TOX_ENTRY_LB_ENTRY_NO,879152795, -sw_ListBox_TP_TOX_ENTRY_LB_FIRSTKEY,879152769, -sw_ListBox_TP_TOX_ENTRY_LB_MAIN_ENTRY_STYLE,879152697, -sw_ListBox_TP_TOX_ENTRY_LB_SECONDKEY,879152771, -sw_ListBox_TP_TOX_ENTRY_LB_THIRDKEY,879152773, sw_ListBox_TP_TOX_SELECT_LB_AREA,879136263, sw_ListBox_TP_TOX_SELECT_LB_BRACKET,879136380, sw_ListBox_TP_TOX_SELECT_LB_CAPTIONSEQUENCE,879136362, @@ -7523,7 +7499,6 @@ sw_MetricField_TP_TABLE_COLUMN_COL_MF_4,888494706, sw_MetricField_TP_TABLE_COLUMN_COL_MF_5,888494708, sw_MetricField_TP_TABLE_COLUMN_COL_MF_6,888494710, sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718, -sw_MetricField_TP_TOX_ENTRY_MF_TABPOS,879155764, sw_ModalDialog_DLG_CHANGE_DB,1419591680, sw_ModalDialog_DLG_DBSELECTION,1435009024, sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176, @@ -7547,7 +7522,6 @@ sw_NumericField_TP_NUMPARA_NF_NEW_START,878860294, sw_NumericField_TP_NUMPARA_NF_RESTART_PARA,878860299, sw_NumericField_TP_TABLE_TEXTFLOW_NF_PAGENUM,878516363, sw_NumericField_TP_TABLE_TEXTFLOW_NF_REPEAT_HEADER,878516264, -sw_NumericField_TP_TOX_ENTRY_NF_LEVEL_OL,879155353, sw_NumericField_TP_TOX_SELECT_NF_LEVEL,879138825,
[Libreoffice-commits] core.git: sw/inc
sw/inc/helpid.h |6 -- 1 file changed, 6 deletions(-) New commits: commit fa22dd910bb9a1ad152d1120a027330fc19a649e Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 26 12:59:18 2013 +0100 drop unused help ids Change-Id: I576f28dc33f7891c7df25e0200e19d02a5824023 diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index eae35fc..8603f5c 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -311,12 +311,6 @@ #define HID_AUTOFORMAT_ACCEPT SW_HID_AUTOFORMAT_ACCEPT #define HID_AUTOFORMAT_EDIT_CHG SW_HID_AUTOFORMAT_EDIT_CHG -//insert index/entries/Pattern buttons and edits -#define HID_TOX_ENTRY_BUTTON SW_HID_TOX_ENTRY_BUTTON -#define HID_TOX_ENTRY_EDIT SW_HID_TOX_ENTRY_EDIT - -#define HID_TOKEN_WINDOW SW_HID_TOKEN_WINDOW - #define HID_AUTH_FIELD_IDENTIFIER SW_HID_AUTH_FIELD_IDENTIFIER #define HID_AUTH_FIELD_AUTHORITY_TYPE SW_HID_AUTH_FIELD_AUTHORITY_TYPE #define HID_AUTH_FIELD_ADDRESS SW_HID_AUTH_FIELD_ADDRESS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/index/cnttab.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 4c96fa780890d2538e744d8080ac689a2fc1d593
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 26 13:08:39 2013 +0100
drop unused helpids fully
Change-Id: I1490fda183bb2315e3d6947941478fa3dd8ed6fb
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c3f6987..5b3e477 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1574,7 +1574,6 @@ public:
bNextControl(false),
m_pParent( pTokenWin )
{
-SetHelpId( HID_TOX_ENTRY_EDIT );
}
virtual voidKeyInput( const KeyEvent rKEvt );
@@ -1654,7 +1653,6 @@ public:
bNextControl(false),
m_pParent(pTokenWin)
{
-SetHelpId(HID_TOX_ENTRY_BUTTON);
}
virtual voidKeyInput( const KeyEvent rKEvt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/asciiopt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aaa1bc40bb197968946c39d4c31c13588191bf55 Author: Eike Rathke er...@redhat.com Date: Mon Aug 26 14:08:08 2013 +0200 resolved fdo#68437 append the bDetectSpecialNumber true string in options Regression introduced with 465dbaecf9890b7117a45d02ea982ef7aca32720 Change-Id: I7c05c7f2460271c421aa358068365d44fb98 diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 2a195ad..827a2f0 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -372,7 +372,7 @@ String ScAsciiOptions::WriteToString() const // Language OUString::number(eLang) + , + // Import quoted field as text. - OUString::boolean( bQuotedFieldAsText ) + ,; + OUString::boolean( bQuotedFieldAsText ) + , + // Detect special numbers. OUString::boolean( bDetectSpecialNumber ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/dbgui/asciiopt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8875f681585e73f3f37088d58c75bf04ad098e2e Author: Eike Rathke er...@redhat.com Date: Mon Aug 26 14:08:08 2013 +0200 resolved fdo#68437 append the bDetectSpecialNumber true string in options Regression introduced with 465dbaecf9890b7117a45d02ea982ef7aca32720 Change-Id: I7c05c7f2460271c421aa358068365d44fb98 (cherry picked from commit aaa1bc40bb197968946c39d4c31c13588191bf55) Reviewed-on: https://gerrit.libreoffice.org/5632 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 2a195ad..827a2f0 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -372,7 +372,7 @@ String ScAsciiOptions::WriteToString() const // Language OUString::number(eLang) + , + // Import quoted field as text. - OUString::boolean( bQuotedFieldAsText ) + ,; + OUString::boolean( bQuotedFieldAsText ) + , + // Detect special numbers. OUString::boolean( bDetectSpecialNumber ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx | 18 + sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 18 + 2 files changed, 36 insertions(+) New commits: commit 5b734c8e19ceb38ec2f632b14fbbc753d95de77e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Aug 26 14:36:23 2013 +0200 Ugly bad and nasty workaround for some dupplicate symbols issue Change-Id: I7283ecff340d95f16bb3a8d0aae97e166fa5f0e4 diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 4801a6d..403dd93 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -17,6 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifdef indices +#undef indices +#endif +#define indices dummy1_indices + +#ifdef extents +#undef extents +#endif +#define extents dummy1_extents + #include AccessibleDocument.hxx #include AccessibleSpreadsheet.hxx #include tabvwsh.hxx @@ -60,6 +70,14 @@ #include list #include algorithm +#ifdef indices +#undef indices +#endif + +#ifdef extents +#undef extents +#endif + using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using ::std::for_each; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 216d717..31ad033 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -17,6 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifdef indices +#undef indices +#endif +#define indices dummy2_indices + +#ifdef extents +#undef extents +#endif +#define extents dummy2_extents + #include scitems.hxx #include editeng/eeitem.hxx #include tools/gen.hxx @@ -42,6 +52,14 @@ #include comphelper/servicehelper.hxx #include toolkit/helper/convert.hxx +#ifdef indices +#undef indices +#endif + +#ifdef extents +#undef extents +#endif + using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source
sc/source/ui/dbgui/asciiopt.cxx | 72
sc/source/ui/inc/asciiopt.hxx | 26 +++---
2 files changed, 35 insertions(+), 63 deletions(-)
New commits:
commit d4d5af7396f997d72487db3127eba7f8a4130a2b
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 26 14:53:30 2013 +0200
translated comments
Change-Id: I29cbd65d57b1c6cc26039c0f5472ecb9e669e6a7
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 628f29b..0f514ce 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -168,7 +168,7 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions rCmp
) const
nInfoCount == rCmp.nInfoCount )
{
OSL_ENSURE( !nInfoCount || (pColStart pColFormat rCmp.pColStart
rCmp.pColFormat),
- 0-Zeiger in ScAsciiOptions );
+ NULL pointer in ScAsciiOptions::operator==() column
info );
for (sal_uInt16 i=0; inInfoCount; i++)
if ( pColStart[i] != rCmp.pColStart[i] ||
pColFormat[i] != rCmp.pColFormat[i] )
@@ -179,11 +179,8 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions
rCmp ) const
return false;
}
-//
-// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-// darum ab Version 336 Komma stattdessen
-//
-
+// The options string must not contain semicolons (because of the pick list),
+// use comma as separator.
void ScAsciiOptions::ReadFromString( const String rString )
{
@@ -192,10 +189,7 @@ void ScAsciiOptions::ReadFromString( const String rString
)
xub_StrLen nSub;
xub_StrLen i;
-//
-// Feld-Trenner
-//
-
+// Field separator.
if ( nCount = 1 )
{
bFixedLen = bMergeFieldSeps = false;
@@ -219,10 +213,7 @@ void ScAsciiOptions::ReadFromString( const String rString
)
}
}
-//
-// Text-Trenner
-//
-
+// Text separator.
if ( nCount = 2 )
{
aToken = rString.GetToken(1,',');
@@ -230,30 +221,21 @@ void ScAsciiOptions::ReadFromString( const String
rString )
cTextSep = (sal_Unicode) nVal;
}
-//
-// Zeichensatz
-//
-
+// Text encoding.
if ( nCount = 3 )
{
aToken = rString.GetToken(2,',');
eCharSet = ScGlobal::GetCharsetValue( aToken );
}
-//
-// Startzeile
-//
-
+// Number of start row.
if ( nCount = 4 )
{
aToken = rString.GetToken(3,',');
nStartRow = aToken.ToInt32();
}
-//
-// Spalten-Infos
-//
-
+// Column info.
if ( nCount = 5 )
{
delete[] pColStart;
@@ -311,10 +293,7 @@ String ScAsciiOptions::WriteToString() const
{
OUString aOutStr;
-//
-// Feld-Trenner
-//
-
+// Field separator.
if ( bFixedLen )
aOutStr += pStrFix;
else if ( !aFieldSeps.Len() )
@@ -335,27 +314,20 @@ String ScAsciiOptions::WriteToString() const
}
}
-aOutStr += , +
- // Text-Trenner
- OUString::number(cTextSep) + ,;
-
-//
-// Zeichensatz
-//
+// Text delimiter.
+aOutStr += , + OUString::number(cTextSep) + ,;
+// Text encoding.
if ( bCharSetSystem ) // force SYSTEM
aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW );
else
aOutStr += ScGlobal::GetCharsetString( eCharSet );
-aOutStr += , +
- // Startzeile
- OUString::number(nStartRow) + ,;
-//
-// Spalten-Infos
-//
+// Number of start row.
+aOutStr += , + OUString::number(nStartRow) + ,;
-OSL_ENSURE( !nInfoCount || (pColStart pColFormat), 0-Zeiger in
ScAsciiOptions );
+// Column info.
+OSL_ENSURE( !nInfoCount || (pColStart pColFormat), NULL pointer in
ScAsciiOptions column info );
for (sal_uInt16 nInfo=0; nInfonInfoCount; nInfo++)
{
if (nInfo)
commit 6dc98de97f6bc4325407b098bb153f359000c717
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 26 14:43:11 2013 +0200
typo in comment
Change-Id: I4557da1d51f563be93ed33bf7a2d1804a73ed07f
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 045d428..628f29b 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -293,7 +293,7 @@ void ScAsciiOptions::ReadFromString( const String rString )
bQuotedFieldAsText = aToken.EqualsAscii(true) ? true : false;
}
-// Detect special nubmers.
+// Detect special numbers.
if (nCount = 8)
{
aToken = rString.GetToken(7, ',');
commit 52810eb4552c4e327d47bca4955bf64acdb1c82e
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 26 14:41:39 2013 +0200
sal_Bool to bool
Change-Id: I3ba3a2074495d01f7877f449ed9b8723161fdd2f
diff --git
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5631 to look at the new patch set (#4). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 21 insertions(+), 102 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/5631/4 -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5631 to look at the new patch set (#5). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 21 insertions(+), 102 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/5631/5 -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/docs
odk/docs/tools.html | 12 1 file changed, 4 insertions(+), 8 deletions(-) New commits: commit 7412cb319a6b3746def85604ec899be706037baf Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 26 15:04:06 2013 +0200 uno-skeletonmaker has -l, does not need -env:UNO_TYPES Change-Id: I08ba8a9e84582a50a7893625139e43408be77278 diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 83b157d..1fdf392 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -676,10 +676,10 @@ types the specified types depend on./p p class=head2Usage:/p blockquote bcode - uno-skeletonmaker (-env:INIFILENAME=lt;urlgt; | -env:UNO_TYPES=lt;url) dump [lt;options] -t lt;typegt; ...br/ - uno-skeletonmaker (-env:INIFILENAME=lt;urlgt; | -env:UNO_TYPES=lt;urlgt;) component [lt;optionsgt;] -n lt;namegt; -t lt;typegt; ...br/ - uno-skeletonmaker (-env:INIFILENAME=lt;urlgt; | -env:UNO_TYPES=lt;urlgt;) calc-add-in [lt;optionsgt;] -n lt;namegt; -t lt;add-in_servicegt;br/ - uno-skeletonmaker (-env:INIFILENAME=lt;urlgt; | -env:UNO_TYPES=lt;urlgt;) add-on [lt;optionsgt;] -n lt;namegt; -p lt;protocol_name:command,...gt; + uno-skeletonmaker (-env:INIFILENAME=lt;urlgt;) dump [lt;options] -t lt;typegt; ...br/ + uno-skeletonmaker (-env:INIFILENAME=lt;urlgt;) component [lt;optionsgt;] -n lt;namegt; -t lt;typegt; ...br/ + uno-skeletonmaker (-env:INIFILENAME=lt;urlgt;) calc-add-in [lt;optionsgt;] -n lt;namegt; -t lt;add-in_servicegt;br/ + uno-skeletonmaker (-env:INIFILENAME=lt;urlgt;) add-on [lt;optionsgt;] -n lt;namegt; -p lt;protocol_name:command,...gt; uno-skeletonmaker -V, --versionbr/ uno-skeletonmaker -h, --helpbr/ /code/b @@ -710,10 +710,6 @@ types the specified types depend on./p td class=cell85url specifies a URL to an UNO ini|rc file of an existing UNO environment (URE, office installation)./td /tr tr -td class=cell15code-env:UNO_TYPES=lt;urlgt;/code/td - td class=cell85url specifies a binary type library file. It can be a space separated list of urls./td - /tr - tr td class=cell15code-a, --all/code/td td class=cell85list all interface methods, not only the direct ones/td /tr ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx |7 +++ sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx |7 +++ 2 files changed, 14 insertions(+) New commits: commit 2492604c92506043982551755710c78dcecf7c31 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Aug 26 14:36:23 2013 +0200 Document a bit the Ugly bad and nasty workaround Somehow, under same circumstances, MSVC creates object code for 2 inlined functions. Nobody here uses them, so simply define them away so that there be no dupplicate symbols anymore. The symbols extents and indices come from boost::multi_array. (cherry picked from commit 5b734c8e19ceb38ec2f632b14fbbc753d95de77e) Change-Id: I7283ecff340d95f16bb3a8d0aae97e166fa5f0e4 diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 403dd93..b38c639 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -17,6 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +/* Somehow, under same circumstances, MSVC creates object code for 2 + * inlined functions. Nobody here uses them, so simply define them away + * so that there be no dupplicate symbols anymore. + + * The symbols extents and indices come from boost::multi_array. + */ + #ifdef indices #undef indices #endif diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 31ad033..1714379 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -17,6 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +/* Somehow, under same circumstances, MSVC creates object code for 2 + * inlined functions. Nobody here uses them, so simply define them away + * so that there be no dupplicate symbols anymore. + + * The symbols extents and indices come from boost::multi_array. + */ + #ifdef indices #undef indices #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source
sw/qa/complex/writer/CheckCrossReferences.java | 74
sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt |binary
sw/source/core/doc/number.cxx | 32 -
3 files changed, 57 insertions(+), 49 deletions(-)
New commits:
commit 2395ae8d2ecb5b527d8856ddbce4831a6d2a7092
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 26 14:59:45 2013 +0200
fdo#33960: simplify SwNumRule::MakeRefNumString further
Change-Id: Ib0e9ccb163d5132ca18142361f72376642915fcb
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 7b8d773..ffd471b 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -730,7 +730,6 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum
rNodeNum,
if ( rNodeNum.GetLevelInListTree() = 0 )
{
bool bOldHadPrefix = true;
-OUString sOldPrefix;
const SwNodeNum* pWorkingNodeNum( rNodeNum );
do
@@ -772,21 +771,9 @@ OUString SwNumRule::MakeRefNumString( const SwNodeNum
rNodeNum,
!aExtremities.nPrefixChars
)
{
-nStrip = 0;
-while (nStrip aExtremities.nSuffixChars)
-{
-++nStrip;
-}
-if (nStrip)
-{
-aPrevStr = aPrevStr.copy(0,
aPrevStr.getLength()-nStrip);
-}
-}
-else if (!aExtremities.nSuffixChars !bOldHadPrefix)
-{
-aRefNumStr = sOldPrefix + aRefNumStr;
+aPrevStr = aPrevStr.copy(0,
+aPrevStr.getLength() - aExtremities.nSuffixChars);
}
-sOldPrefix = OUString();
bOldHadPrefix = ( aExtremities.nPrefixChars 0);
commit ee41ad3482011b3e736b8bbd51353f71b2369dfb
Author: Troy Rollo libreoff...@troy.rollo.name
Date: Mon Aug 26 13:35:45 2013 +0200
fdo#33960: sw: fix cross reference fields some more
Change-Id: Ia0a34c8fa475f9dea609962997bce9169d9b8878
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java
b/sw/qa/complex/writer/CheckCrossReferences.java
index 541ea49..c12f81a 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -38,28 +38,20 @@ public class CheckCrossReferences {
public com.sun.star.text.XTextField getNextField()
throws com.sun.star.uno.Exception
{
-if ( xPortionEnum != null ) {
-while ( xPortionEnum.hasMoreElements() ) {
-com.sun.star.beans.XPropertySet xPortionProps =
+while (true) {
+while (xPortionEnum == null) {
+if (!xParaEnum.hasMoreElements())
+fail(Cannot retrieve next field.);
+
+com.sun.star.container.XEnumerationAccess aPara =
UnoRuntime.queryInterface(
-com.sun.star.beans.XPropertySet.class ,
xPortionEnum.nextElement());
-final String sPortionType =
-xPortionProps.getPropertyValue( TextPortionType
).toString();
-if ( sPortionType.equals( TextField) ) {
-com.sun.star.text.XTextField xField =
UnoRuntime.queryInterface(
-com.sun.star.text.XTextField.class,
-xPortionProps.getPropertyValue( TextField ) );
-assertNotNull(Cannot retrieve next field., xField);
-return xField;
-}
+com.sun.star.container.XEnumerationAccess.class,
xParaEnum.nextElement());
+xPortionEnum = aPara.createEnumeration();
}
-}
-while ( xParaEnum.hasMoreElements() ) {
-com.sun.star.container.XEnumerationAccess aPara =
-UnoRuntime.queryInterface(
-com.sun.star.container.XEnumerationAccess.class,
xParaEnum.nextElement());
-xPortionEnum = aPara.createEnumeration();
+if ( xPortionEnum == null )
+break;
+
while ( xPortionEnum.hasMoreElements() ) {
com.sun.star.beans.XPropertySet xPortionProps =
UnoRuntime.queryInterface(
@@ -74,9 +66,9 @@ public class CheckCrossReferences {
return xField;
}
}
+xPortionEnum = null;
}
-fail(Cannot retrieve next field.);
return null; // unreachable
}
@@ -135,6 +127,12 @@ public class CheckCrossReferences {
final String FldResult4 = 1;
final String FldResult5 = 1;
final String FldResult6 = A.1;
+final String FldResult7 = 2(a);
+final String FldResult8 = 2(b);
+final String FldResult9 = 2;
+final String
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa sw/source
sw/qa/complex/writer/CheckCrossReferences.java | 74
sw/qa/complex/writer/testdocuments/CheckCrossReferences.odt |binary
sw/source/core/doc/number.cxx | 16 --
3 files changed, 56 insertions(+), 34 deletions(-)
New commits:
commit 4760c79afe37eaa95a93f3e8ad0a2775c86359dd
Author: Troy Rollo libreoff...@troy.rollo.name
Date: Mon Aug 26 15:14:40 2013 +0200
fdo#33960: sw: fix cross reference fields some more
Change-Id: I46f9cf4132835c10ad82c9b014e5e8647902ab5e
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java
b/sw/qa/complex/writer/CheckCrossReferences.java
index 541ea49..c12f81a 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -38,28 +38,20 @@ public class CheckCrossReferences {
public com.sun.star.text.XTextField getNextField()
throws com.sun.star.uno.Exception
{
-if ( xPortionEnum != null ) {
-while ( xPortionEnum.hasMoreElements() ) {
-com.sun.star.beans.XPropertySet xPortionProps =
+while (true) {
+while (xPortionEnum == null) {
+if (!xParaEnum.hasMoreElements())
+fail(Cannot retrieve next field.);
+
+com.sun.star.container.XEnumerationAccess aPara =
UnoRuntime.queryInterface(
-com.sun.star.beans.XPropertySet.class ,
xPortionEnum.nextElement());
-final String sPortionType =
-xPortionProps.getPropertyValue( TextPortionType
).toString();
-if ( sPortionType.equals( TextField) ) {
-com.sun.star.text.XTextField xField =
UnoRuntime.queryInterface(
-com.sun.star.text.XTextField.class,
-xPortionProps.getPropertyValue( TextField ) );
-assertNotNull(Cannot retrieve next field., xField);
-return xField;
-}
+com.sun.star.container.XEnumerationAccess.class,
xParaEnum.nextElement());
+xPortionEnum = aPara.createEnumeration();
}
-}
-while ( xParaEnum.hasMoreElements() ) {
-com.sun.star.container.XEnumerationAccess aPara =
-UnoRuntime.queryInterface(
-com.sun.star.container.XEnumerationAccess.class,
xParaEnum.nextElement());
-xPortionEnum = aPara.createEnumeration();
+if ( xPortionEnum == null )
+break;
+
while ( xPortionEnum.hasMoreElements() ) {
com.sun.star.beans.XPropertySet xPortionProps =
UnoRuntime.queryInterface(
@@ -74,9 +66,9 @@ public class CheckCrossReferences {
return xField;
}
}
+xPortionEnum = null;
}
-fail(Cannot retrieve next field.);
return null; // unreachable
}
@@ -135,6 +127,12 @@ public class CheckCrossReferences {
final String FldResult4 = 1;
final String FldResult5 = 1;
final String FldResult6 = A.1;
+final String FldResult7 = 2(a);
+final String FldResult8 = 2(b);
+final String FldResult9 = 2;
+final String FldResult10 = 1(a);
+final String FldResult11 = (b);
+final String FldResult12 = (a);
// variables for current field
com.sun.star.text.XTextField xField = null;
@@ -175,6 +173,42 @@ public class CheckCrossReferences {
checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult6 );
checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+
+xField = getNextField();
+xProps = getFieldProps( xField );
+checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult7 );
+checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
+checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+
+xField = getNextField();
+xProps = getFieldProps( xField );
+checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult8 );
+checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult11 );
+checkField( xField, xProps,
com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult8 );
+
+xField = getNextField();
+xProps = getFieldProps( xField );
+checkField( xField, xProps,
[Libreoffice-commits] core.git: sd/inc
sd/inc/drawdoc.hxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 38b58556b4e28e21f7e807593134c6b6745a1bbd
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 26 15:25:38 2013 +0200
sd: fix C++11ism
Change-Id: Ia03d4794a8d1fc2967946866a0d2975e5e52d6bb
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 6ef4c27..46790a4 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -189,7 +189,8 @@ private:
DECL_LINK(OnlineSpellEventHdl, EditStatus*);
std::vector OUString maAnnotationAuthors;
-
std::vectorcom::sun::star::uno::Referencecom::sun::star::xml::dom::XNode
maLayoutInfo;
+std::vectorcom::sun::star::uno::Reference
+com::sun::star::xml::dom::XNode maLayoutInfo;
boolmbUseEmbedFonts;
@@ -267,7 +268,9 @@ public:
/// load xml-based impress layout definitions into document
void InitLayoutVector();
/// return reference to vector of Impress layout definitions
-const
std::vectorcom::sun::star::uno::Referencecom::sun::star::xml::dom::XNode
GetLayoutVector() const { return maLayoutInfo; }
+const std::vectorcom::sun::star::uno::Reference
+com::sun::star::xml::dom::XNode GetLayoutVector() const
+{ return maLayoutInfo; }
/** Insert pages into this document
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx| 34 +-
desktop/source/app/langselect.cxx | 525 ++
desktop/source/app/langselect.hxx | 48 ---
3 files changed, 179 insertions(+), 428 deletions(-)
New commits:
commit 37e36eca17563b2580abf97f4f46a470387e5b70
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 26 15:35:25 2013 +0200
Related fdo#68240: Rework langselect to provide better error messages
...and in general removed lots of cruft from that code.
Change-Id: Ie673413d8abf5a8ec78c02f4abee2647bdf10a04
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a3dd116..28651f9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -36,7 +36,9 @@
#include exithelper.h
#include migration.hxx
+#include svl/languageoptions.hxx
#include svtools/javacontext.hxx
+#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/frame/AutoRecovery.hpp
#include com/sun/star/frame/GlobalEventBroadcaster.hpp
#include com/sun/star/frame/SessionListener.hpp
@@ -334,7 +336,7 @@ ResMgr* Desktop::GetDesktopResManager()
// Use VCL to get the correct language specific message as we
// are in the bootstrap process and not able to get the installed
// language!!
-OUString aUILocaleString = LanguageSelection::getLanguageString();
+OUString aUILocaleString = langselect::getEmergencyLocale();
LanguageTag aLanguageTag( aUILocaleString);
//! ResMgr may modify the Locale for fallback!
Desktop::pResMgr = ResMgr::SearchCreateResMgr( dkt,
aLanguageTag);
@@ -580,13 +582,16 @@ void Desktop::Init()
if ( m_aBootstrapError == BE_OK )
{
-// prepare language
-if ( !LanguageSelection::prepareLanguage() )
+try
{
-if ( LanguageSelection::getStatus() ==
LanguageSelection::LS_STATUS_CANNOT_DETERMINE_LANGUAGE )
+if (!langselect::prepareLocale())
+{
SetBootstrapError( BE_LANGUAGE_MISSING, OUString() );
-else
-SetBootstrapError( BE_OFFICECONFIG_BROKEN, OUString() );
+}
+}
+catch (css::uno::Exception e)
+{
+SetBootstrapError( BE_OFFICECONFIG_BROKEN, e.Message );
}
}
@@ -979,14 +984,15 @@ void Desktop::HandleBootstrapErrors(
}
else if ( aBootstrapError == BE_OFFICECONFIG_BROKEN )
{
-OUString aMessage;
-OUStringBuffer aDiagnosticMessage( 100 );
-OUString aErrorMsg;
-aErrorMsg = GetMsgString( STR_CONFIG_ERR_ACCESS_GENERAL,
-OUString( A general error occurred while accessing your central
configuration. ) );
-aDiagnosticMessage.append( aErrorMsg );
-aMessage = MakeStartupErrorMessage(
aDiagnosticMessage.makeStringAndClear() );
-FatalError(aMessage);
+OUString msg(
+GetMsgString(
+STR_CONFIG_ERR_ACCESS_GENERAL,
+(A general error occurred while accessing your central
+ configuration.)));
+if (!aErrorMessage.isEmpty()) {
+msg += \n(\ + aErrorMessage + \);
+}
+FatalError(MakeStartupErrorMessage(msg));
}
else if ( aBootstrapError == BE_USERINSTALL_FAILED )
{
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index 5fc4bc2..19c5edc 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -17,424 +17,197 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include boost/shared_ptr.hpp
+#include com/sun/star/configuration/theDefaultProvider.hpp
+#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/lang/XLocalizable.hpp
+#include com/sun/star/uno/Exception.hpp
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/Sequence.hxx
+#include comphelper/configuration.hxx
+#include comphelper/processfactory.hxx
+#include i18nlangtag/lang.h
+#include i18nlangtag/languagetag.hxx
+#include i18nlangtag/mslangid.hxx
+#include officecfg/Office/Linguistic.hxx
+#include officecfg/Setup.hxx
+#include officecfg/System.hxx
+#include rtl/ustring.hxx
+#include sal/log.hxx
+#include sal/types.h
+#include svl/languageoptions.hxx
#include app.hxx
-#include langselect.hxx
-#include cmdlineargs.hxx
-#include stdio.h
-
-#include rtl/string.hxx
-#include i18nlangtag/mslangid.hxx
-#include i18nlangtag/languagetag.hxx
-#include comphelper/processfactory.hxx
-#include com/sun/star/configuration/theDefaultProvider.hpp
-#include com/sun/star/container/XNameAccess.hpp
-#include com/sun/star/lang/XComponent.hpp
-#include com/sun/star/beans/NamedValue.hpp
-#include com/sun/star/util/XChangesBatch.hpp
-#include com/sun/star/uno/Any.hxx
-#include com/sun/star/lang/XLocalizable.hpp
-#include com/sun/star/lang/Locale.hpp
-#include
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/typedstrdata.hxx |5
sc/source/core/data/column3.cxx |6
sc/source/core/tool/typedstrdata.cxx | 25 +++
sc/source/ui/cctrl/checklistmenu.cxx | 250 +--
sc/source/ui/inc/checklistmenu.hxx | 32
sc/source/ui/view/gridwin.cxx|5
6 files changed, 305 insertions(+), 18 deletions(-)
New commits:
commit c2920b6d82bc667771edbc183b47d8e6ea1222dd
Author: Noel Power noel.po...@suse.com
Date: Mon Aug 26 14:36:33 2013 +0100
add magic incantation for expander buttons in treelist, tweak some methods
improved changed check behaviour, now check/unchecking a node not only
affects
children but ancestor nodes, cleaned up some of the code, renamed various
methods
Change-Id: If9f552ffe4c3610c259513020ee1d298cf1197bc
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 08aa1b4..455fc3f 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -884,7 +884,7 @@ void ScCheckListMenuWindow::CancelButton::Click()
ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument*
pDoc) :
ScMenuFloatingWindow(pParent, pDoc),
-maChecks(this, 0),
+maChecks(this, WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT |
WB_HASBUTTONSATROOT ),
maChkToggleAll(this, 0),
maBtnSelectSingle (this, 0),
maBtnUnselectSingle(this, 0),
@@ -1085,7 +1085,7 @@ void ScCheckListMenuWindow::setAllMemberState(bool bSet)
{
size_t n = maMembers.size();
for (size_t i = 0; i n; ++i)
-maChecks.CheckEntryPos( maMembers[i].maName, maMembers[i].mpParent,
bSet);
+maChecks.CheckEntry( maMembers[i].maName, maMembers[i].mpParent, bSet);
if (!maConfig.mbAllowEmptySet)
// We need to have at least one member selected.
@@ -1095,9 +1095,8 @@ void ScCheckListMenuWindow::setAllMemberState(bool bSet)
void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet)
{
setAllMemberState(!bSet);
-//sal_uInt16 nSelected = maChecks.GetSelectEntryPos();
SvTreeListEntry* pEntry = maChecks.GetCurEntry();
-maChecks.CheckEntryPos(pEntry, bSet );
+maChecks.CheckEntry(pEntry, bSet );
}
void ScCheckListMenuWindow::cycleFocus(bool bReverse)
@@ -1170,7 +1169,7 @@ IMPL_LINK( ScCheckListMenuWindow, CheckHdl,
SvTreeListBox*, pChecks )
return 0;
SvTreeListEntry* pEntry = pChecks-GetHdlEntry();
if ( pEntry )
-maChecks.CheckEntryPos( pEntry, ( pChecks-GetCheckButtonState(
pEntry ) == SV_BUTTON_CHECKED ) );
+maChecks.CheckEntry( pEntry, ( pChecks-GetCheckButtonState( pEntry )
== SV_BUTTON_CHECKED ) );
size_t nNumChecked = maChecks.GetCheckedEntryCount();
if (nNumChecked == maMembers.size())
// all members visible
@@ -1338,6 +1337,18 @@ void ScCheckListMenuWindow::addMember(const OUString
rName, bool bVisible)
maMembers.push_back(aMember);
}
+ScCheckListBox::ScCheckListBox( Window* pParent, WinBits nWinStyle )
+ : SvTreeListBox( pParent, nWinStyle ), mpCheckButton( NULL )
+{
+Init();
+}
+
+ScCheckListBox::ScCheckListBox( Window* pParent, const ResId rResId )
+ : SvTreeListBox( pParent, rResId ), mpCheckButton( NULL )
+{
+Init();
+}
+
SvTreeListEntry* ScCheckListBox::FindEntry( SvTreeListEntry* pParent, const
OUString sNode )
{
sal_uInt16 nRootPos = 0;
@@ -1367,19 +1378,16 @@ sal_Bool ScCheckListBox::IsChecked( OUString sName,
SvTreeListEntry* pParent )
return sal_False;
}
-void ScCheckListBox::CheckEntryPos( OUString sName, SvTreeListEntry* pParent,
sal_Bool bCheck )
+void ScCheckListBox::CheckEntry( OUString sName, SvTreeListEntry* pParent,
sal_Bool bCheck )
{
SvTreeListEntry* pEntry = FindEntry( pParent, sName );
if ( pEntry )
-CheckEntryPos( pEntry, bCheck );
+CheckEntry( pEntry, bCheck );
}
-void ScCheckListBox::CheckEntryPos( SvTreeListEntry* pParent, sal_Bool bCheck )
+// Recursively check all children of pParent
+void ScCheckListBox::CheckAllChildren( SvTreeListEntry* pParent, sal_Bool
bCheck )
{
-// currently pParent ( and *all* children ) are checked with state of
bCheck
-// *BUT* if this is not a Root node then bCheck here should also influence
the
-// ancestor hierarchy ( e.g. a child node checked or uncheck MAY need to
check/uncheck
-// the parent/grandparent node )
if ( pParent )
{
SetCheckButtonState(
@@ -1389,11 +1397,45 @@ void ScCheckListBox::CheckEntryPos( SvTreeListEntry*
pParent, sal_Bool bCheck )
SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : First();
while ( pEntry )
{
-CheckEntryPos( pEntry, bCheck );
+CheckAllChildren( pEntry, bCheck );
pEntry = NextSibling( pEntry );
}
}
+void ScCheckListBox::CheckEntry( SvTreeListEntry* pParent, sal_Bool bCheck )
+{
+// recursively check all items below pParent
+CheckAllChildren( pParent, bCheck
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - filter/inc filter/source sw/source writerfilter/source
filter/inc/filter/msfilter/util.hxx |7
filter/source/msfilter/util.cxx | 19 +
sw/source/filter/ww8/docxattributeoutput.cxx | 32 ++
sw/source/filter/ww8/docxattributeoutput.hxx |7
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 26 ++---
5 files changed, 68 insertions(+), 23 deletions(-)
New commits:
commit 2f684f3de4f356bc570d279a392a6afe862314c3
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Aug 26 11:35:48 2013 +0200
bnc#834035 DOCX export: fix hyperlinks of illustration index
We used to export raw Writer bookmarks, but that's not valid in OOXML.
Instead, it has normal bookmarks around the sequence fields, so use them
if they are available.
Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265
(cherry picked from commit e9275c08acc2f4f1c925f78b56a1089515cd9a37)
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 58d6b0a..bb7bd74 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -614,6 +614,7 @@ void DocxAttributeOutput::DoWriteBookmarks()
FSNS( XML_w, XML_id ), OString::valueOf( sal_Int32( nId )
).getStr( ),
FSNS( XML_w, XML_name ), rName.getStr(),
FSEND );
+m_sLastOpenedMark = rName;
}
m_rMarksStart.clear();
@@ -743,6 +744,12 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos
rInfos, bool bWriteRun )
void DocxAttributeOutput::DoWriteCmd( String rCmd )
{
+OUString sCmd = OUString(rCmd).trim();
+if (sCmd.startsWith(SEQ))
+{
+OUString sSeqName = msfilter::util::findQuotedText(sCmd, SEQ ,
'\\').trim();
+m_aSeqMarksNames[sSeqName].push_back(m_sLastOpenedMark);
+}
// Write the Field command
m_pSerializer-startElementNS( XML_w, XML_instrText, FSEND );
m_pSerializer-writeEscaped( OUString( rCmd ) );
@@ -1225,8 +1232,33 @@ bool DocxAttributeOutput::StartURL( const String rUrl,
const String rTarget )
m_pHyperlinkAttrList-add( FSNS( XML_r, XML_id), sId.getStr());
}
else
+{
+// Is this a link to a sequence? Then try to replace that with a
+// normal bookmark, as Word won't understand our special
+// seqname!index|sequence syntax.
+OUString aMark(sMark);
+if (aMark.endsWith(|sequence))
+{
+sal_Int32 nPos = aMark.indexOf('!');
+if (nPos != -1)
+{
+// Extract seqname, the field instruction text has the
name quoted.
+OUString aSequenceName = OUString('') + aMark.copy(0,
nPos) + OUString('');
+// Extract index.
+sal_uInt32 nIndex = aMark.copy(nPos + 1, aMark.getLength()
- nPos - sizeof(|sequence)).toInt32();
+std::mapOUString, std::vectorOString ::iterator it =
m_aSeqMarksNames.find(aSequenceName);
+if (it != m_aSeqMarksNames.end())
+{
+std::vectorOString rNames = it-second;
+if (rNames.size() nIndex)
+// We know the bookmark name for this sequence and
this index, do the replacement.
+sMark = OStringToOUString(rNames[nIndex],
RTL_TEXTENCODING_UTF8);
+}
+}
+}
m_pHyperlinkAttrList-add( FSNS( XML_w, XML_anchor ),
OUStringToOString( OUString( sMark ),
RTL_TEXTENCODING_UTF8 ).getStr( ) );
+}
OUString sTarget( rTarget );
if ( !sTarget.isEmpty() )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index ecdc243..cd81387 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -586,6 +586,13 @@ private:
/// Maps of the bookmarks ids
std::maprtl::OString, sal_uInt16 m_rOpenedMarksIds;
+/// Name of the last opened bookmark.
+OString m_sLastOpenedMark;
+
+/// If there are bookmarks around sequence fields, this map contains the
+/// names of these bookmarks for each sequence.
+std::mapOUString, std::vectorOString m_aSeqMarksNames;
+
/// The current table helper
SwWriteTable *m_pTableWrt;
commit 201aa49d9a386844822087362cccd49dbff9d21a
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Aug 26 11:05:04 2013 +0200
bnc#834035 Introduce msfilter::util::findQuotedText()
This was in writerfilter, but we'll need it soon in sw as well, so move
it down to msfilter.
Change-Id: I8efe02b6bbe8f391d9e14857ed58dbae184d5632
(cherry picked from commit 750f0ebf97d19d1cf305dabe72d52ad6e90adf70)
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/settings.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 65afcc5a9e440ef4b1ac15800b2c32c4219a2908
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Sat Aug 24 21:26:51 2013 -0300
[PERSONA] Place default persona in explicit folder
Search for defaults personas footer.jpg and header.jpg in a dedicated
installation folder, under share/gallery/persona.
Change-Id: Ie79513136c4330771b0dfaaf2d04bcd07f2d8b05
Reviewed-on: https://gerrit.libreoffice.org/5606
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4cbc502..92d2816 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -791,13 +791,20 @@ static void setupPersonaHeaderFooter( WhichPersona
eWhich, OUString rHeaderFoot
if ( !aName.isEmpty() )
{
+OUString gallery();
// try the gallery first, then the program path:
-OUString gallery = ${$BRAND_BASE_DIR/ LIBO_ETC_FOLDER /
SAL_CONFIGFILE( bootstrap) ::UserInstallation};
-rtl::Bootstrap::expandMacros( gallery );
-gallery += /user/gallery/personas/;
-
-if ( aPersona == own )
-rHeaderFooterBitmap = readBitmapEx( gallery + aName );
+if ( aPersona == own)
+{
+gallery = ${$BRAND_BASE_DIR/ LIBO_ETC_FOLDER / SAL_CONFIGFILE(
bootstrap) ::UserInstallation};
+rtl::Bootstrap::expandMacros( gallery );
+gallery += /user/gallery/personas/;
+}
+else if (aPersona == default)
+{
+gallery = $BRAND_BASE_DIR/ LIBO_SHARE_FOLDER;
+gallery += /gallery/personas/;
+}
+rHeaderFooterBitmap = readBitmapEx( gallery + aName );
if ( rHeaderFooterBitmap.IsEmpty() )
rHeaderFooterBitmap = readBitmapEx( $BRAND_BASE_DIR/
LIBO_ETC_FOLDER / + aName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/filter/html/css1atr.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 5d963c0c996d50fa1033e7c2da48b5d1c3747f20
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Aug 26 13:23:56 2013 +
122867: HTML export - correct function pointer table which holds the export
functions for certain attributes
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index a334fc7..c84bc1b 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3744,6 +3744,8 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_CHRATR_OVERLINE */ OutCSS1_SvxOverline,
/* RES_CHRATR_DUMMY1 */ 0,
/* RES_CHRATR_DUMMY2 */ 0,
+/* RES_CHRATR_BIDIRTL */0,
+/* RES_CHRATR_IDCTHINT */ 0,
/* RES_TXTATR_REFMARK */0,
/* RES_TXTATR_TOXMARK */0,
@@ -3773,9 +3775,9 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_PARATR_HYPHENZONE*/ 0,
/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop,
/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit
-/* RES_PARATR_NUMRULE */0, // Dummy:
-/* RES_PARATR_SCRIPTSPACE */0, // Dummy:
-/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy:
+/* RES_PARATR_NUMRULE */0,
+/* RES_PARATR_SCRIPTSPACE */0,
+/* RES_PARATR_HANGINGPUNCTUATION */ 0,
/* RES_PARATR_FORBIDDEN_RULES */0, // new
/* RES_PARATR_VERTALIGN */ 0, // new
/* RES_PARATR_SNAPTOGRID*/ 0, // new
@@ -3822,13 +3824,13 @@ SwAttrFnTab aCSS1AttrFnTab = {
/* RES_COLUMNBALANCE */ 0,
/* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection,
/* RES_HEADER_FOOTER_EAT_SPACING */ 0,
-/* RES_FRMATR_DUMMY9 */ 0, // Dummy:
+/* RES_ROW_SPLIT */ 0,
/* RES_FOLLOW_TEXT_FLOW */ 0,
+/* RES_COLLAPSING_BORDERS */0,
/* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0,
-/* RES_FRMATR_DUMMY2 */ 0, // Dummy:
-/* RES_AUTO_STYLE */0, // Dummy:
-/* RES_FRMATR_DUMMY4 */ 0, // Dummy:
-/* RES_FRMATR_DUMMY5 */ 0, // Dummy:
+/* RES_AUTO_STYLE */0,
+/* RES_FRMATR_STYLE_NAME */ 0,
+/* RES_FRMATR_CONDITIONAL_STYLE_NAME */ 0,
/* RES_GRFATR_MIRRORGRF */ 0,
/* RES_GRFATR_CROPGRF */ 0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cmis' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 908c36f6829389f5dc0e214497af035c18971995 Author: Cédric Bosdonnat cedric.bosdonnat@free.fr Date: Wed Aug 7 17:23:35 2013 +0200 Updated libcmis to 0.4.1: only build changes for distros Change-Id: Ie5bd26d0fd9e3cd2b590b3b1ee1753faee533d63 diff --git a/download.lst b/download.lst index 2eec2bc..2da0d20 100644 --- a/download.lst +++ b/download.lst @@ -16,7 +16,7 @@ export BOOST_TARBALL := a00d22605d5dbcfb4c9936a9b35bc4c2-boost_1_53_0.tar.bz2 export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz -export CMIS_TARBALL := a649ee75b673cedff7e3322097ca199f-libcmis-0.4.0.tar.gz +export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz export CPPUNIT_TARBALL := ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt export CURL_TARBALL := 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - odk/docs unodevtools/source
odk/docs/tools.html |3
unodevtools/source/skeletonmaker/cpptypemaker.cxx |4 -
unodevtools/source/skeletonmaker/javacompskeleton.cxx | 57 +-
unodevtools/source/skeletonmaker/javatypemaker.cxx| 10 +--
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 26 ++--
unodevtools/source/skeletonmaker/skeletoncommon.hxx |3
unodevtools/source/skeletonmaker/skeletonmaker.cxx| 10 ---
7 files changed, 36 insertions(+), 77 deletions(-)
New commits:
commit 3cb10e9220da27ca7db2f68007be9e310bdefc4d
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 26 16:00:41 2013 +0200
unodevtools: drop support for skeletonmaker --java4 parameter
Minimum requirement has been Java 1.5 for years now.
Change-Id: Id512507db1fc12c92d8f7662505eda6866da2fc6
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 1fdf392..a3e5571 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -714,9 +714,8 @@ types the specified types depend on./p
td class=cell85list all interface methods, not only
the direct ones/td
/tr
tr
-td class=cell15code--(java4|java5|cpp)/code/td
+td class=cell15code--(java5|cpp)/code/td
td class=cell85select the target languagebr/
- --java4 generate output for Java 1.4 or earlierbr/
--java5 generate output for Java 1.5 or later (is
currently the default)br/
--cpp generate output for C++/td
/tr
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 7306b12..0f4ef76 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -290,7 +290,7 @@ void generateXLocalizableBodies(std::ostream o) {
return m_locale;\n}\n\n;
}
-void generateXAddInBodies(std::ostream o, ProgramOptions const options)
+void generateXAddInBodies(std::ostream o, ProgramOptions const )
{
// com.sun.star.sheet.XAddIn:
// getProgrammaticFuntionName
@@ -330,36 +330,21 @@ void generateXAddInBodies(std::ostream o, ProgramOptions
const options)
// getDisplayArgumentName
o public String getDisplayArgumentName(String
aProgrammaticFunctionName, int nArgument)\n{\n;
-if (options.java5) {
-o return getAddinProperty(aProgrammaticFunctionName,\n
-m_functionMap.get(\n
-
aProgrammaticFunctionName).get(
-nArgument),\n
-sDISPLAYNAME);\n}\n\n;
-} else {
-o return getAddinProperty(aProgrammaticFunctionName,
(String)\n
-
((java.util.Hashtable)m_functionMap.
-get(\n
aProgrammaticFunctionName)).
-get(\nnew
Integer(nArgument))
-, sDISPLAYNAME);\n}\n\n;
-}
+o return getAddinProperty(aProgrammaticFunctionName,\n
+m_functionMap.get(\n
+aProgrammaticFunctionName).get(
+nArgument),\n
+sDISPLAYNAME);\n}\n\n;
// getArgumentDescription
o public String getArgumentDescription(String
aProgrammaticFunctionName, int nArgument)\n{\n;
-if (options.java5) {
-o return getAddinProperty(aProgrammaticFunctionName,\n
-m_functionMap.get(\n
-
aProgrammaticFunctionName).get(
-nArgument),\n
-sDESCRIPTION);\n}\n\n;
-} else {
-o return getAddinProperty(aProgrammaticFunctionName,
(String)\n
-
((java.util.Hashtable)m_functionMap.
-get(\n
aProgrammaticFunctionName)).
-get(\nnew
Integer(nArgument))
-, sDESCRIPTION);\n}\n\n;
-}
+o return getAddinProperty(aProgrammaticFunctionName,\n
+m_functionMap.get(\n
+aProgrammaticFunctionName).get(
+nArgument),\n
+sDESCRIPTION);\n}\n\n;
+
// getProgrammaticCategoryName
o public String getProgrammaticCategoryName(String
aProgrammaticFunctionName)\n{\n
@@ -618,24 +603,16 @@ void generateAddinConstructorAndHelper(std::ostream o,
m_xHAccess = null;\n
private
Re: Question o default persona
Hi Olivier, [adding the ML in case this was interesting for others] Olivier Hallot píše v So 24. 08. 2013 v 09:40 -0300: I googled a bit and ever went to the source code, but I am lost on the option of having a default persona (own) in LibreOffice. Can you drop me some short lines to let me know how the default (aka Pre-installed theme) works? Where am I supposed to drop/set the image? It used to work so that there was an 'edition/' subfolder in the 'program/' dir, but that was cleaned up by Stephan at some stage, so great that you've stepped in for this - thank you! The commit that removed that was this one: http://cgit.freedesktop.org/libreoffice/core/commit/?id=1c2862e8d130fac1279e293a9fe9992f3fe91591 Search for the settings.cxx there. I like your solution (default persona in 'program/gallery/personas/' instead of in 'program/edition/'), so let's stick to that going forward :-) Merged as http://cgit.freedesktop.org/libreoffice/core/commit/?id=65afcc5a9e440ef4b1ac15800b2c32c4219a2908 Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/global.hxx |9 +
sc/source/core/data/table2.cxx |3 ++-
sc/source/ui/view/viewfun3.cxx |2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 07a69320a7b475e8b09b2faca8b6f728a62372ec
Author: Michael Meeks michael.me...@suse.com
Date: Thu Aug 22 17:45:18 2013 +0100
fdo#39484 - don't loose outlines while trying to undo formulae changes.
Reviewed-on: https://gerrit.libreoffice.org/5592
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Conflicts:
sc/source/core/data/table2.cxx
Change-Id: Ib3b2bab5beffb8164a8cd2c0b4db4c97f427507e
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index d559d74..e306669 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -187,12 +187,13 @@ const sal_uInt16 IDF_HARDATTR = 0x0020; /// Hard cell
attributes.
const sal_uInt16 IDF_STYLES = 0x0040; /// Cell styles.
const sal_uInt16 IDF_OBJECTS= 0x0080; /// Drawing objects.
const sal_uInt16 IDF_EDITATTR = 0x0100; /// Rich-text attributes.
-const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
-const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES;
-const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING |
IDF_NOTE | IDF_FORMULA;
-const sal_uInt16 IDF_ALL= IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
+const sal_uInt16 IDF_OUTLINE= 0x0800; /// Sheet / outlining (grouping)
information
const sal_uInt16 IDF_NOCAPTIONS = 0x0200; /// Internal use only (undo etc.):
do not copy/delete caption objects of cell notes.
const sal_uInt16 IDF_ADDNOTES = 0x0400; /// Internal use only (copy from
clip): do not delete existing cell contents when pasting notes.
+const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
+const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE;
+const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING |
IDF_NOTE | IDF_FORMULA | IDF_OUTLINE;
+const sal_uInt16 IDF_ALL= IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
/// Copy flags for auto/series fill functions: do not touch notes and drawing
objects.
const sal_uInt16 IDF_AUTOFILL = IDF_ALL ~(IDF_NOTE | IDF_OBJECTS);
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 00d0632..f34f087 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -,7 +,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2,
if (bFlagChange)
pDestTab-InvalidatePageBreaks();
-pDestTab-SetOutlineTable( pOutlineTable ); // auch nur wenn
bColRowFlags
+if(nFlags IDF_OUTLINE) // also only when bColRowFlags
+pDestTab-SetOutlineTable( pOutlineTable );
}
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e4417ab..b7de8ce 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1205,7 +1205,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags,
ScDocument* pClipDoc,
// all sheets - CopyToDocument skips those that don't exist in pUndoDoc
SCTAB nTabCount = pDoc-GetTableCount();
pDoc-CopyToDocument( nStartCol, nStartRow, 0, nUndoEndCol,
nUndoEndRow, nTabCount-1,
-nUndoFlags, false, pUndoDoc );
+ nUndoFlags, false, pUndoDoc );
if ( bCutMode )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk scp2/source
Repository.mk | 36 +--- scp2/source/ooo/file_library_ooo.scp | 75 -- scp2/source/ooo/module_hidden_ooo.scp | 12 - 3 files changed, 21 insertions(+), 102 deletions(-) New commits: commit 32848f0a8d9e30f77bc482f9295b2561b94cf7ca Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Sun Aug 25 20:20:29 2013 -0300 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Reviewed-on: https://gerrit.libreoffice.org/5631 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/Repository.mk b/Repository.mk index 3ccadb1..25abdbd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -125,12 +125,6 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) -ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES) -$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - pl \ -)) -endif - ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ npsoplugin \ @@ -219,6 +213,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ canvastools \ chartcore \ chartcontroller \ + $(if $(filter $(OS),WNT),,cmdmail) \ cppcanvas \ configmgr \ ctl \ @@ -305,6 +300,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ offacc \ passwordcontainer \ pcr \ + $(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \ pdffilter \ $(if $(DISABLE_SCRIPTING),,protocolhandler) \ res \ @@ -320,6 +316,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ simplecanvas \ slideshow \ sot \ + spell \ $(if $(ENABLE_HEADLESS),,spl) \ $(if $(DISABLE_SCRIPTING),,stringresource) \ svgio \ @@ -376,6 +373,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ) \ smplmail \ wininetbe1 \ + $(if $(filter YES,$(WITH_MOZAB4WIN)), \ + mozab2 \ + mozabdrv \ + ) \ + $(if $(filter NO,$(WITH_MOZAB4WIN)),mozbootstrap) \ + ) \ + $(if $(filter $(OS),WNT),, \ + mork \ + mozbootstrap \ ) \ $(if $(filter $(OS),MACOSX), \ $(if $(ENABLE_MACOSX_SANDBOX),, \ @@ -411,15 +417,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sdbc \ avmediaQuickTime \ filtertracer \ - mork \ - mozab2 \ - mozabdrv \ rpt \ rptui \ rptxml \ simplecm \ spa \ - spell \ sts \ vclplug_tde \ vclplug_kde \ @@ -524,6 +526,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ localedata_euro \ localedata_others \ mcnttype \ + $(if $(ENABLE_JAVA), \ + $(if $(filter $(OS),MACOSX),,officebean) \ + ) \ +$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ package2 \ $(if $(DISABLE_SCRIPTING),,scriptframe) \ sdbc2 \ @@ -542,15 +548,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ xmlsecurity \ xsec_fw \ xstor \ + $(if $(filter $(OS),MACOSX), \ + macab1 \ + macabdrv1 \ + ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ - emboleobj \ libreoffice \ - macab1 \ - macabdrv1 \ - mozbootstrap \ - officebean \ pyuno \ pyuno_wrapper \ recentfile \ @@ -592,7 +597,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - cmdmail \ OGLTrans \ pdfimport \ postgresql-sdbc \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5638439..a86e8d7 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -82,11 +82,6 @@ End #endif - -#if ! defined WNT // no longer supported on Windows -STD_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail ) -#endif - #ifndef SYSTEM_CURL File gid_File_Lib_Curl @@ -110,27 +105,6 @@ End #endif -/* fdo#60491 always need emboleobj library on non-WNT platforms */ -#if !defined(WNT) || !defined(DISABLE_ATL) -SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) -#endif - -#ifdef UNX - -#ifdef MACOSX -File gid_File_Lib_Macab_1 -PACKED_LIB_FILE_BODY; -Name = STRING(CONCAT2(libmacab1,UNXSUFFIX)); -End - -File gid_File_Lib_Macab_Drv_1 -PACKED_LIB_FILE_BODY; -Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX)); -End
[PUSHED] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5631 Approvals: LibreOffice gerrit bot: Verified Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.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 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|51554 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC]Use Widget Layout for the Start Center Weekly Update 07
Hi Krisztian, Sorry for my late reply :-( Krisztian Pinter píše v St 21. 08. 2013 v 21:08 +0200: I'm also working on adding a toggle button to switch between recent docs and templates, but I encountered a problem. Here's a patch with a non-functioning test version: https://gerrit.libreoffice.org/#/c/5543/ I have two custom widgets in a grid, one for templates and one for recent docs, but they both render as a narrow white strip. (See the tab for presentations.) On the last tab, you can see that the custom widget for templates is working properly. This turns out to conflict with the recent addition of more of the buttons - can you please rebase it on top of the current master? Will have a look tomorrow :-) I was asked if I could make the scrolling smoother (it always moves thumbnails 1 row at once when the scrollbar passes a treshold) in the RecentDocsView class I made. RecentDocsView inherits from ThumbnailView, which uses Window::HandleScrollCommand for scrolling. Is it possible to make it smoother without basically reimplementing Window::HandleScrollCommand? So I believe this is more about how the scrollbar in ThumbnailView is setup, than the exact handling of HandleScrollCommand. If I read it correctly, mpScrBar in sfx2/source/control/thumbnailview.cxx uses things like mpScrBar-SetRangeMax( (nCurCount+mnCols-1)/mnCols); and mpScrBar-SetThumbPos( (long)mnFirstLine ); ie. is explicitly set so that 1 line is one thumbnail only. I'd try to make it multiplied by 10 or so, and adjust the drawing offset obtaining the current position accordingly - does that make sense? In the original Start Center, one could drag and drop files onto it, and they would open. I noticed that this only worked if one didn't drop the file on a button, but on the background. After converting to .ui, it only works if one drops the file on the edge of the window, where there aren't any widgets covering the background. Is there a way to cover the whole window with the dragdrop functionality? Hard to say - I'd try to add the drag and drop handler for one of the buttons to check if you can make it work that way on one of the buttons; and if that works, go for a broader solution. And if no broader solution exists, then either decide that we are not going to support that any longer, or set all the widgets with the drop functionality ;-) I was asked to make the background of RecentDocsView transparent, instead of white. I checked, and ThumbnailView::Paint draws a rounded rectangle with it's set background color. I set this color to COL_TRANSPARENT, and now indeed it seems not to draw this rectangle, but the background of the custom widget is still a white rectangle. Is this behavior inherited from Window or Control or something? And is it possible to change it? The inherited Paint methods don't seem to be drawing anything. I haven't looked deeper, but there is that SetBackground() function; you might want to use something like SetBackground(Wallpaper( COL_TRANSPARENT )) But did not try it myself; if that does not lead anywhere, please poke me, I'll play with that. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/asciiopt.cxx | 61
sc/source/ui/dbgui/imoptdlg.cxx |3 +
sc/source/ui/docshell/impex.cxx |2 -
sc/source/ui/inc/asciiopt.hxx | 13
4 files changed, 60 insertions(+), 19 deletions(-)
New commits:
commit 5af6437f6b602773fb76dca76be1fc079d93c922
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 26 18:10:53 2013 +0200
resolved fdo#53449 weight given separators to pick one for output
Change-Id: Iaef3ed270d870f7c26062cdbbc9bf243bc5b5a78
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 0f514ce..2170a04 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -179,6 +179,25 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions
rCmp ) const
return false;
}
+String lcl_decodeSepString( const String rSepNums, bool o_bMergeFieldSeps )
+{
+String aFieldSeps;
+xub_StrLen nSub = comphelper::string::getTokenCount( rSepNums, '/');
+for (xub_StrLen i=0; inSub; ++i)
+{
+String aCode = rSepNums.GetToken( i, '/' );
+if ( aCode.EqualsAscii(pStrMrg) )
+o_bMergeFieldSeps = true;
+else
+{
+sal_Int32 nVal = aCode.ToInt32();
+if ( nVal )
+aFieldSeps += (sal_Unicode) nVal;
+}
+}
+return aFieldSeps;
+}
+
// The options string must not contain semicolons (because of the pick list),
// use comma as separator.
@@ -186,31 +205,16 @@ void ScAsciiOptions::ReadFromString( const String
rString )
{
xub_StrLen nCount = comphelper::string::getTokenCount(rString, ',');
String aToken;
-xub_StrLen nSub;
-xub_StrLen i;
// Field separator.
if ( nCount = 1 )
{
bFixedLen = bMergeFieldSeps = false;
-aFieldSeps.Erase();
aToken = rString.GetToken(0,',');
if ( aToken.EqualsAscii(pStrFix) )
bFixedLen = true;
-nSub = comphelper::string::getTokenCount(aToken, '/');
-for ( i=0; inSub; i++ )
-{
-String aCode = aToken.GetToken( i, '/' );
-if ( aCode.EqualsAscii(pStrMrg) )
-bMergeFieldSeps = true;
-else
-{
-sal_Int32 nVal = aCode.ToInt32();
-if ( nVal )
-aFieldSeps += (sal_Unicode) nVal;
-}
-}
+aFieldSeps = lcl_decodeSepString( aToken, bMergeFieldSeps);
}
// Text separator.
@@ -242,7 +246,7 @@ void ScAsciiOptions::ReadFromString( const String rString )
delete[] pColFormat;
aToken = rString.GetToken(4,',');
-nSub = comphelper::string::getTokenCount(aToken, '/');
+xub_StrLen nSub = comphelper::string::getTokenCount(aToken, '/');
nInfoCount = nSub / 2;
if (nInfoCount)
{
@@ -354,4 +358,27 @@ String ScAsciiOptions::WriteToString() const
return aOutStr;
}
+// static
+sal_Unicode ScAsciiOptions::GetWeightedFieldSep( const String rFieldSeps,
bool bDecodeNumbers )
+{
+bool bMergeFieldSeps = false;
+String aFieldSeps( bDecodeNumbers ? lcl_decodeSepString( rFieldSeps,
bMergeFieldSeps) : rFieldSeps);
+if (aFieldSeps.Len() = 1)
+return aFieldSeps.GetChar(0);
+else
+{
+// There can be only one separator for output. See also fdo#53449
+if (aFieldSeps.Search(',') != STRING_NOTFOUND)
+return ',';
+else if (aFieldSeps.Search('\t') != STRING_NOTFOUND)
+return '\t';
+else if (aFieldSeps.Search(';') != STRING_NOTFOUND)
+return ';';
+else if (aFieldSeps.Search(' ') != STRING_NOTFOUND)
+return ' ';
+else
+return aFieldSeps.GetChar(0);
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index f1dc8de..be8c9f6 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -18,6 +18,7 @@
*/
#include imoptdlg.hxx
+#include asciiopt.hxx
#include scresid.hxx
#include imoptdlg.hrc
#include comphelper/string.hxx
@@ -51,7 +52,7 @@ ScImportOptions::ScImportOptions( const String rStr )
if( aToken.EqualsIgnoreCaseAscii( pStrFix ) )
bFixedWidth = sal_True;
else
-nFieldSepCode = (sal_Unicode) aToken.ToInt32();
+nFieldSepCode = ScAsciiOptions::GetWeightedFieldSep( aToken, true);
nTextSepCode = (sal_Unicode) rStr.GetToken(1,',').ToInt32();
aStrFont = rStr.GetToken(2,',');
eCharSet = ScGlobal::GetCharsetValue(aStrFont);
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index e2c67fa..aae1b47 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -187,7 +187,7 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions
rOpt )
// normale Optionen uebernehmen
[Libreoffice-commits] core.git: sc/source
sc/source/ui/cctrl/checklistmenu.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit d198d2fb1b3d1d65450f9be30a94b00631d3c9b8 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 26 19:15:38 2013 +0300 WaE: unused variable 'vParts' [loplugin] Change-Id: I6d025e7531880889d49170901776bd19c3a0 diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 455fc3f..d3aab5d 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1295,7 +1295,6 @@ void ScCheckListMenuWindow::addDateMember(const OUString rsName, double nVal, b } maChecks.SetUpdateMode(false); sal_Int32 nIndex = 0; -std::vector OUString vParts; OUString sParent; SvTreeListEntry* pParent = NULL; int count = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 674fa5d5f09b64c781bf90a5c2c7f456695d Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 26 19:47:19 2013 +0300 ENABLE_NPAPI_FROM_BROWSER is YES or NO, not YES or empty Change-Id: I991f7b97cbe3ba178eaca9e2316cd7e4bff0ebe0 diff --git a/Repository.mk b/Repository.mk index 25abdbd..75ed517 100644 --- a/Repository.mk +++ b/Repository.mk @@ -300,7 +300,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ offacc \ passwordcontainer \ pcr \ - $(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \ + $(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pl) \ pdffilter \ $(if $(DISABLE_SCRIPTING),,protocolhandler) \ res \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Updates about Enhanced Database Ranges.
What I managed to get done: -Optimise calculation code. -Figure out and code the pBackground stuff from FillInfo() but coding it is still work in progress like its almost over with pushing that soon. -Ignore the failing test case. -Learn from Kohei's latest patches. What I will get done in 2 days time: -Rendering would be done with. -Stripe size import export. Whats to be done this week: -Frond end UI for all this. -Polish some sloppy coding in import/export I have identified. -More to be added here On 8/20/13, Akash Shetye shetyeak...@gmail.com wrote: Here is what I have done and what I will be doing. Last week: -Wrote the calculation part for rendering. -Wrote a failing stub fro using this calculation and setting the style sheet. -Looked at the rendering of statically formatted cells (by applying style sheets). This week: -Get done with the rendering for once. -Optimise calculation code. -Why are some tests failing..investigate the sw_subsequentexport test. On Fri, Aug 16, 2013 at 3:29 AM, Akash Shetye shetyeak...@gmail.com wrote: -- Forwarded message -- From: Akash Shetye shetyeak...@gmail.com Date: Thu, Aug 15, 2013 at 8:16 PM Subject: Re: Updates about Enhanced Database Ranges. To: Akash Shetye shetyeak...@gmail.com Hello all, Updating everyone about the branch's progress after a long long time. I have managed to get done the import and export of table styles and tables from .xlsx back to .xlsx from LO. LO now supports the import of table styles but there is nothing in place about the export to Open Document Format of these table styles. Currently I am swimming around the rendering codeand should be getting on with something to show pretty soon like in a 3 days. What follows after that is the making of rendering code that actually works when when you reposition tables etc but that is something to worry about after the initial rendering is done. Also dialog and much UI stuff is way pending. See you next week. On Thu, Jul 25, 2013 at 1:39 AM, Akash Shetye shetyeak...@gmail.comwrote: Hello I have completed the table style export to OOXML just yesterday however the code needs a lot of ironing out. About exporting the tables to open document format. The tables created in excel are available in the xlsx zip at /tables/table#.xml where # is the number of the table defined in excel so if you define 4 tables., you will have 4 xml files in there one each. This data is parsed and successfully imported into calc. I spoke with markus some time ago about exporting table styles to open document. He mentioned writing a rfc or something later on for that so that is on hold. The export to excel of these db ranges will be done only for those db ranges that use any table formatting. This should not be that difficult, I realised that this only involves searching through the ScDBData collection and identifying the ranges that have formatting and writing the xml for them in /tables/.. Even if db ranges are stored as expressions or anything in calc, they will be easily exportable to excel. I think we will not have to worry about that. Once thats done full excel support for table styles will be achieved. I will push that soon. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_export-test.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit fd2c823fbc304a2cedf5fff9661f67b4c16c6cf7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 26 13:40:41 2013 -0400
Fix this export test. Now this test passes.
Change-Id: Ia3d11c6fb29c7938e0d8f6e25636da5d22b4a8c8
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 90ced45..6ec6550 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -35,6 +35,7 @@
#include editeng/wghtitem.hxx
#include editeng/postitem.hxx
#include editeng/editdata.hxx
+#include editeng/eeitem.hxx
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -77,7 +78,7 @@ public:
CPPUNIT_TEST(testColorScaleExportXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST(testNamedRangeBugfdo62729);
-// CPPUNIT_TEST(testRichTextExportODS); This currently fails.
+CPPUNIT_TEST(testRichTextExportODS);
CPPUNIT_TEST(testInlineArrayXLS);
CPPUNIT_TEST(testEmbeddedChartXLS);
CPPUNIT_TEST(testFormulaReferenceXLS);
@@ -361,7 +362,7 @@ void ScExportTest::testRichTextExportODS()
SfxItemSet aItemSet = rEE.GetEmptyItemSet();
aSel.nStartPos = 0;
aSel.nEndPos = 4;
-SvxWeightItem aWeight(WEIGHT_BOLD, ATTR_FONT_WEIGHT);
+SvxWeightItem aWeight(WEIGHT_BOLD, EE_CHAR_WEIGHT);
aItemSet.Put(aWeight);
rEE.QuickSetAttribs(aItemSet, aSel);
}
@@ -369,7 +370,7 @@ void ScExportTest::testRichTextExportODS()
{
// Set the 'Italic' part italic.
SfxItemSet aItemSet = rEE.GetEmptyItemSet();
-SvxPostureItem aItalic(ITALIC_NORMAL, ATTR_FONT_POSTURE);
+SvxPostureItem aItalic(ITALIC_NORMAL, EE_CHAR_ITALIC);
aItemSet.Put(aItalic);
aSel.nStartPos = 9;
aSel.nEndPos = 15;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC]Firebird Integration Weekly Update 11
On Sun, 2013-08-25 at 17:48 +0100, Andrzej Hunt wrote: - Data Insertion works but buggy.* *Data is entered in the db ok (i.e. shown after closing and reopening a table), but shown either incorrectly or not at all in the GUI directly after insertion -- this is an anomaly in the interaction of dbaccess's RowSet/CacheSet/etc. and the firebird-sdbc ResultSet which I'm currently investigating. I've tracked the issue down to PreparedStatement::executeUpdate not returning the correct number of rows changed (I hadn't got around to implementing this -- 0 was returned as a temporary solution) and dbaccess's KeySet relies on this value to detect that an insert has taken place. I've put a quick hack in place to make things work (return 1), so the driver is more or less usable for most editing of strings in the Gui now. (I'll try and add correct detection of the rows changed for executeUpdates return value, and add support for basic numeric types next.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx |4
connectivity/source/drivers/firebird/ResultSet.cxx | 144 +++--
connectivity/source/drivers/firebird/ResultSet.hxx | 48 +---
3 files changed, 63 insertions(+), 133 deletions(-)
New commits:
commit 3b228541290b6d6b8ef390b941f812abc280d438
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Mon Aug 26 18:43:16 2013 +0100
Quick hack to make driver usable with dbaccess/KeySet. (firebird-sdbc)
Change-Id: I6500a7666ad2fc2ffcb29934d6f2b36761867950
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 9f4637a..7645748 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -307,7 +307,9 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
{
execute();
// TODO: get the number of rows changed -- look in
Statement::executeUpdate for details
-return 0;
+// 1 is a temporary hack so that things like dbaccess's keyset which rely
+// on the value work correctly.
+return 1;
}
Reference XResultSet SAL_CALL OPreparedStatement::executeQuery()
commit b3b560e29514616382d687cb95d6fe7632c223b3
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Aug 23 19:42:55 2013 +0100
Clean up PropertyHelper stuff, set ResultSet properties. (firebird-sdbc)
Change-Id: If2f2041b0f072f36fe56e92b9e54bbb0be8a5860
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 237d569..2afd1a4 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -57,7 +57,7 @@ OResultSet::OResultSet(OConnection* pConnection,
isc_stmt_handle aStatementHandle,
XSQLDA* pSqlda)
: OResultSet_BASE(pConnection-getMutex())
-, OPropertySetHelper(OResultSet_BASE::rBHelper)
+, OPropertyContainer(OResultSet_BASE::rBHelper)
, m_pConnection(pConnection)
, m_xStatement(xStatement)
, m_xMetaData(0)
@@ -69,6 +69,31 @@ OResultSet::OResultSet(OConnection* pConnection,
, m_fieldCount(pSqlda? pSqlda-sqld : 0)
{
SAL_INFO(connectivity.firebird, OResultSet().);
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),
+ PROPERTY_ID_ISBOOKMARKABLE,
+ PropertyAttribute::READONLY,
+ m_bIsBookmarkable,
+ ::getCppuType(m_bIsBookmarkable));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
+ PROPERTY_ID_FETCHSIZE,
+ PropertyAttribute::READONLY,
+ m_nFetchSize,
+ ::getCppuType(m_nFetchSize));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
+ PROPERTY_ID_RESULTSETTYPE,
+ PropertyAttribute::READONLY,
+ m_nResultSetType,
+ ::getCppuType(m_nResultSetType));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
+ PROPERTY_ID_FETCHDIRECTION,
+ PropertyAttribute::READONLY,
+ m_nFetchDirection,
+ ::getCppuType(m_nFetchDirection));
+
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
+ PROPERTY_ID_RESULTSETCONCURRENCY,
+ PropertyAttribute::READONLY,
+ m_nResultSetConcurrency,
+ ::getCppuType(m_nResultSetConcurrency));
if (!pSqlda)
return; // TODO: what?
@@ -258,33 +283,16 @@ void SAL_CALL OResultSet::checkRowIndex()
throw SQLException( Row index is out of valid range., *this,
OUString(),1, Any() );
}
}
-// -
-void OResultSet::disposing(void)
-{
-
-OPropertySetHelper::disposing();
-
-MutexGuard aGuard(m_pConnection-getMutex());
-m_xMetaData = NULL;
-}
-// -
Any SAL_CALL OResultSet::queryInterface( const Type rType )
throw(RuntimeException)
{
Any aRet = OPropertySetHelper::queryInterface(rType);
-if(!aRet.hasValue())
-aRet = OResultSet_BASE::queryInterface(rType);
-return aRet;
+return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
}
-// -
- Sequence Type SAL_CALL OResultSet::getTypes( ) throw( RuntimeException)
-{
-OTypeCollection aTypes(
-::cppu::UnoType uno::Reference
::com::sun::star::beans::XMultiPropertySet ::get(),
-
[Libreoffice-commits] core.git: Repository.mk
Repository.mk | 37 + 1 file changed, 21 insertions(+), 16 deletions(-) New commits: commit 7666c262533415914b08ec3129fbbc52aa2e96e9 Author: Michael Stahl mst...@redhat.com Date: Mon Aug 26 19:47:33 2013 +0200 Repository.mk: fix some errors in 32848f0a and 3f8c36ca Various libaries were moved from PLAINLIBS to OOOLIBS but are referenced with their full DLL file name in the code, e.g. inprocserv.dll and all the MSI customactions; move them back to PLAINLIBS. (mozbootstrap was also renamed but it shouldn't be a problem). Change-Id: Ibca8f355f84008a525021a8d5484200a7e73758f diff --git a/Repository.mk b/Repository.mk index 75ed517..9d54eca 100644 --- a/Repository.mk +++ b/Repository.mk @@ -356,21 +356,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xsltfilter \ $(if $(filter $(OS),WNT), \ ado \ - dnd \ - dtrans \ - fps \ - ftransl \ - $(if $(ENABLE_JAVA),java_uno_accessbridge) \ - $(if $(DISABLE_ATL),,oleautobridge \ - inprocserv \ - ) \ - $(if $(WINDOWS_SDK_HOME),instooofiltmsi \ - qslnkmsi \ - reg4allmsdoc \ - sdqsmsi \ - sellangmsi \ - sn_tools \ - ) \ + $(if $(DISABLE_ATL),,oleautobridge) \ smplmail \ wininetbe1 \ $(if $(filter YES,$(WITH_MOZAB4WIN)), \ @@ -529,7 +515,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_JAVA), \ $(if $(filter $(OS),MACOSX),,officebean) \ ) \ -$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ + $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ package2 \ $(if $(DISABLE_SCRIPTING),,scriptframe) \ sdbc2 \ @@ -552,6 +538,25 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ macab1 \ macabdrv1 \ ) \ + $(if $(filter WNT,$(OS)), \ + dnd \ + dtrans \ + fps \ + ftransl \ + $(if $(ENABLE_JAVA),java_uno_accessbridge) \ + $(if $(DISABLE_ATL),,\ + oleautobridge \ + inprocserv \ + ) \ + $(if $(WINDOWS_SDK_HOME),\ + instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ + ) \ + ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 405edb013db8ecda701d99cc4e04d154929d152d Author: Michael Stahl mst...@redhat.com Date: Mon Aug 26 20:06:49 2013 +0200 oops Change-Id: I2e0584037201001aaa4926bf5fc8d4a6df72bd32 diff --git a/Repository.mk b/Repository.mk index 9d54eca..bd8a4ee 100644 --- a/Repository.mk +++ b/Repository.mk @@ -545,7 +545,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ftransl \ $(if $(ENABLE_JAVA),java_uno_accessbridge) \ $(if $(DISABLE_ATL),,\ - oleautobridge \ inprocserv \ ) \ $(if $(WINDOWS_SDK_HOME),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/windows/feature.pm |1 +
solenv/bin/modules/installer/windows/shortcut.pm |1 +
solenv/bin/modules/pre2par/language.pm |1 -
3 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3f29153ab6535d5e2fd975540dd39f4f61e211fc
Author: Andras Timar ati...@suse.com
Date: Mon Aug 26 11:10:47 2013 -0700
fdo#68158 fix quote escaping problems
It was not clear, why pre2par escaped quote, because it was already
escaped in .ulf file. I think that the Tooltip/Description cases were
simply overlooked, because at other places other kind of strings
were processed, i.e. \ was replaced to .
Change-Id: Idcd8c8cb627dbfd0e3cc9961b19cae236de3e25f
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index 602beaf..d023a74 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -387,6 +387,7 @@ sub create_feature_table
$feature{'feature_parent'} = get_feature_parent($onefeature);
$feature{'Title'} = $onefeature-{'Name'};
$feature{'Description'} = $onefeature-{'Description'};
+$feature{'Description'} =~ s/\\\/\/g; # no more masquerading of
''
$feature{'Display'} = get_feature_display($onefeature);
$feature{'Level'} = get_feature_level($onefeature);
$feature{'Directory_'} = get_feature_directory($onefeature);
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm
b/solenv/bin/modules/installer/windows/shortcut.pm
index 4a8526e..b32c772 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -199,6 +199,7 @@ sub get_shortcut_description
my $description = ;
if ( $shortcut-{'Tooltip'} ) { $description = $shortcut-{'Tooltip'}; }
+$description =~ s/\\\/\/g; # no more masquerading of ''
return $description;
}
diff --git a/solenv/bin/modules/pre2par/language.pm
b/solenv/bin/modules/pre2par/language.pm
index e38ef80..842c86d 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -37,7 +37,6 @@ sub get_language_string_from_language_block
if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\(.*)\\s*$/ )
{
$newstring = $1;
-$newstring =~ s/\/\\\/g; # masquerading all '' in the string
$newstring = \ . $newstring . \;
last;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/ResultSet.cxx |5 +
connectivity/source/drivers/firebird/ResultSet.hxx | 10 +-
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 250864d869153ceec5ef29804c0e9d00a8db82e2
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 26 20:25:57 2013 +0200
connectivity: firebird::OResultSet: convert to C++98
Change-Id: I9036539204789d0886a51fcbc3d821012cc9eaee
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 2afd1a4..a0a4f58 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -58,6 +58,11 @@ OResultSet::OResultSet(OConnection* pConnection,
XSQLDA* pSqlda)
: OResultSet_BASE(pConnection-getMutex())
, OPropertyContainer(OResultSet_BASE::rBHelper)
+, m_bIsBookmarkable(false)
+, m_nFetchSize(1)
+, m_nResultSetType(::com::sun::star::sdbc::ResultSetType::FORWARD_ONLY)
+, m_nFetchDirection(::com::sun::star::sdbc::FetchDirection::FORWARD)
+,
m_nResultSetConcurrency(::com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY)
, m_pConnection(pConnection)
, m_xStatement(xStatement)
, m_xMetaData(0)
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx
b/connectivity/source/drivers/firebird/ResultSet.hxx
index e206ceb..fb8e4b1 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -67,11 +67,11 @@ namespace connectivity
public
::comphelper::OPropertyArrayUsageHelperOResultSet
{
private:
-sal_Bool m_bIsBookmarkable = sal_False;
-sal_Int32 m_nFetchSize = 1;
-sal_Int32 m_nResultSetType =
::com::sun::star::sdbc::ResultSetType::FORWARD_ONLY;
-sal_Int32 m_nFetchDirection =
::com::sun::star::sdbc::FetchDirection::FORWARD;
-sal_Int32 m_nResultSetConcurrency =
::com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY;
+sal_Bool m_bIsBookmarkable;
+sal_Int32 m_nFetchSize;
+sal_Int32 m_nResultSetType;
+sal_Int32 m_nFetchDirection;
+sal_Int32 m_nResultSetConcurrency;
protected:
OConnection* m_pConnection;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#39468 German comments for svx/source/tbxctrls/fillctrl.cxx
Hello, Here is a patch to translate German comments on the file I'm working on. 0001-fdo-39468-Translate-German-comments.patch http://nabble.documentfoundation.org/file/n4071677/0001-fdo-39468-Translate-German-comments.patch Laurent BP - LibreOffice 4.1.1.2 -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-39468-German-comments-for-svx-source-tbxctrls-fillctrl-cxx-tp4071677.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/app/gendisp.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b2f6ef8423ca4f3c18c1603c3561388088fbc0cb
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Aug 24 19:28:56 2013 +0200
Simplify a bit iterator management
Change-Id: Id15fb18df7b1a8da1ff260f8b2c72ed6cd5d352a
Reviewed-on: https://gerrit.libreoffice.org/5605
Tested-by: Jan Holesovsky ke...@suse.cz
Reviewed-by: Jan Holesovsky ke...@suse.cz
diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx
index fffb5aa..0e197c1 100644
--- a/vcl/generic/app/gendisp.cxx
+++ b/vcl/generic/app/gendisp.cxx
@@ -113,18 +113,18 @@ void SalGenericDisplay::CancelInternalEvent( SalFrame*
pFrame, void* pData, sal_
{
if( ! m_aUserEvents.empty() )
{
-std::list SalUserEvent ::iterator it, next;
-next = m_aUserEvents.begin();
-do
+std::list SalUserEvent ::iterator it = m_aUserEvents.begin();
+while (it != m_aUserEvents.end())
{
-it = next++;
if( it-m_pFrame== pFrame
it-m_pData == pData
it-m_nEvent== nEvent )
{
-m_aUserEvents.erase( it );
+it = m_aUserEvents.erase( it );
}
-} while( next != m_aUserEvents.end() );
+else
+++it;
+}
}
osl_releaseMutex( m_aEventGuard );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx | 183 --
sc/source/filter/xml/xmlcelli.cxx | 16 +-
sc/source/filter/xml/xmlcelli.hxx |2
3 files changed, 183 insertions(+), 18 deletions(-)
New commits:
commit 969d5a3b97903fe32b3a7da0c3de8bf86f323c17
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 26 15:28:46 2013 -0400
fdo#68581: The first paragraph text can be legitimately empty.
Change-Id: I2309a0c6aebc8a111e67e2e3d591cbabfbbadfb4
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 69f5a73..1f17009 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -600,10 +600,10 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32
nBegin, sal_Int32 nEnd, cons
OUString ScXMLTableRowCellContext::GetFirstParagraph() const
{
-if (maFirstParagraph.isEmpty())
+if (!maFirstParagraph)
return mpEditEngine-GetText(0);
-return maFirstParagraph;
+return *maFirstParagraph;
}
void ScXMLTableRowCellContext::PushParagraphFieldDate(const OUString
rStyleName)
@@ -635,12 +635,12 @@ void ScXMLTableRowCellContext::PushParagraphEnd()
if (mbEditEngineHasText)
{
-if (!maFirstParagraph.isEmpty())
+if (maFirstParagraph)
{
// Flush the cached first paragraph first.
mpEditEngine-Clear();
-mpEditEngine-SetText(maFirstParagraph);
-maFirstParagraph = OUString();
+mpEditEngine-SetText(*maFirstParagraph);
+maFirstParagraph.reset();
}
mpEditEngine-InsertParagraph(mpEditEngine-GetParagraphCount(),
maParagraph.makeStringAndClear());
}
@@ -652,7 +652,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd()
}
else if (mnCurParagraph == 0)
{
-maFirstParagraph = maParagraph.makeStringAndClear();
+maFirstParagraph.reset(maParagraph.makeStringAndClear());
mbEditEngineHasText = true;
}
@@ -1089,10 +1089,10 @@ void ScXMLTableRowCellContext::PutTextCell( const
ScAddress rCurrentPos,
}
else if (mbEditEngineHasText)
{
-if (!maFirstParagraph.isEmpty())
+if (maFirstParagraph)
{
// This is a normal text without format runs.
-rDoc.setStringCell(rCurrentPos, maFirstParagraph);
+rDoc.setStringCell(rCurrentPos, *maFirstParagraph);
}
else
{
diff --git a/sc/source/filter/xml/xmlcelli.hxx
b/sc/source/filter/xml/xmlcelli.hxx
index e49e3a3..15c95fb 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -63,9 +63,9 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
boost::optionalFormulaWithNamespace maFormula; /// table:formula
attribute
boost::optionalOUString maStringValue; /// office:string-value
attribute
boost::optionalOUString maContentValidationName;
+boost::optionalOUString maFirstParagraph; /// unformatted first
paragraph, for better performance.
ScEditEngineDefaulter* mpEditEngine;
-OUString maFirstParagraph; /// unformatted first paragraph, for better
performance.
OUStringBuffer maParagraph;
sal_Int32 mnCurParagraph;
commit 70e582c8cd3f5f0eedfead6c9da8c771db34e49b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 26 15:11:33 2013 -0400
Add more test cases for rich text cell export to ODS.
This currently fails due to a real bug.
Change-Id: Ia8a91f0794837cae2b6c3beab656f3377f3d0f6a
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 6ec6550..b805e4f 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -36,6 +36,8 @@
#include editeng/postitem.hxx
#include editeng/editdata.hxx
#include editeng/eeitem.hxx
+#include editeng/editobj.hxx
+#include editeng/sectionattribute.hxx
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -343,10 +345,140 @@ void ScExportTest::testNamedRangeBugfdo62729()
void ScExportTest::testRichTextExportODS()
{
+struct
+{
+static bool isBold(const editeng::SectionAttribute rAttr)
+{
+if (rAttr.maAttributes.empty())
+return false;
+
+std::vectorconst SfxPoolItem*::const_iterator it =
rAttr.maAttributes.begin(), itEnd = rAttr.maAttributes.end();
+for (; it != itEnd; ++it)
+{
+const SfxPoolItem* p = *it;
+if (p-Which() != EE_CHAR_WEIGHT)
+continue;
+
+return static_castconst SvxWeightItem*(p)-GetWeight() ==
WEIGHT_BOLD;
+}
+return false;
+}
+
+static bool isItalic(const editeng::SectionAttribute rAttr)
+{
+if (rAttr.maAttributes.empty())
+return false;
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - filter/source include/filter sw/CppunitTest_sw_ooxmlexport.mk sw/qa sw/source writerfilter/source
filter/source/msfilter/util.cxx | 19 ++
include/filter/msfilter/util.hxx |7 ++
sw/CppunitTest_sw_ooxmlexport.mk |1
sw/qa/extras/ooxmlexport/data/bnc834035.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 63 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 32 +++
sw/source/filter/ww8/docxattributeoutput.hxx |7 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 28 +
8 files changed, 133 insertions(+), 24 deletions(-)
New commits:
commit dbce1c855a9a8a61f1636b1e37bd83e176eb8e2a
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Aug 26 11:05:04 2013 +0200
bnc#834035 DOCX export: fix hyperlinks of illustration index
We used to export raw Writer bookmarks, but that's not valid in OOXML.
Instead, it has normal bookmarks around the sequence fields, so use them
if they are available.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/filter/ww8/docxattributeoutput.cxx
(cherry picked from commits 750f0ebf97d19d1cf305dabe72d52ad6e90adf70,
e9275c08acc2f4f1c925f78b56a1089515cd9a37 and
8f146a8042dd8f3c88f39f8317372cd9c02ce4ad)
Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265
Reviewed-on: https://gerrit.libreoffice.org/5635
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index bf612c3..a10e438 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -427,6 +427,25 @@ const ApiPaperSize
PaperSizeConv::getApiSizeForMSPaperSizeIndex( sal_Int32 nMSO
return spPaperSizeTable[ nMSOPaperIndex ];
}
+OUString findQuotedText( const OUString rCommand,
+const sal_Char* cStartQuote, const sal_Unicode uEndQuote )
+{
+OUString sRet;
+OUString sStartQuote( OUString::createFromAscii(cStartQuote) );
+sal_Int32 nStartIndex = rCommand.indexOf( sStartQuote );
+if( nStartIndex = 0 )
+{
+sal_Int32 nStartLength = sStartQuote.getLength();
+sal_Int32 nEndIndex = rCommand.indexOf( uEndQuote, nStartIndex +
nStartLength);
+if( nEndIndex nStartIndex )
+{
+sRet = rCommand.copy( nStartIndex + nStartLength, nEndIndex -
nStartIndex - nStartLength);
+}
+}
+return sRet;
+
+}
+
}
}
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index e134199..38cdf56 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -88,6 +88,13 @@ public:
static sal_Int32 getMSPaperSizeIndex( const com::sun::star::awt::Size
rSize );
static const ApiPaperSize getApiSizeForMSPaperSizeIndex( sal_Int32
nMSOPaperIndex );
};
+
+/**
+ * Finds the quoted text in a field instruction text.
+ *
+ * Example: SEQ Figure \someoption - Figure
+ */
+MSFILTER_DLLPUBLIC OUString findQuotedText( const OUString rCommand, const
sal_Char* cStartQuote, const sal_Unicode uEndQuote );
}
}
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index e96961f..2e90bec 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
ucb/source/ucp/file/ucpfile1 \
unotools/util/utl \
unoxml/source/service/unoxml \
+ uui/util/uui \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/qa/extras/ooxmlexport/data/bnc834035.odt
b/sw/qa/extras/ooxmlexport/data/bnc834035.odt
new file mode 100644
index 000..393c960
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc834035.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2ed291f..fd1c30a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -10,6 +10,7 @@
#include com/sun/star/frame/XStorable.hpp
#include com/sun/star/drawing/FillStyle.hpp
#include com/sun/star/awt/Gradient.hpp
+#include com/sun/star/packages/zip/ZipFileAccess.hpp
#include com/sun/star/style/TabStop.hpp
#include com/sun/star/view/XViewSettingsSupplier.hpp
#include com/sun/star/text/XTextFrame.hpp
@@ -73,6 +74,7 @@ public:
void testN822175();
void testFdo58577();
void testFdo60990();
+void testBnc834035();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -82,6 +84,14 @@ public:
private:
void run();
+/**
+ * Given that some problem doesn't affect the result in the importer, we
+ * test the resulting file directly, by opening the zip file, parsing an
+ * xml stream, and asserting an XPath expression. This method returns the
+ * xml stream, so that you can do the asserting.
+ */
+xmlDocPtr parseExport();
+void assertXPath(xmlDocPtr
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/tabctrl.cxx | 37 +
1 file changed, 25 insertions(+), 12 deletions(-)
New commits:
commit fa9a2aaa2246e6eb0665d36aa7c6c75fd31c4e3e
Author: Stefano Facchini stefano.facch...@gmail.com
Date: Thu Aug 22 21:48:19 2013 +0200
fdo#66435: distribute tabs more evenly across rows
Change-Id: I9df2312f257867fc89aa29672f2d58ea40363b14
Reviewed-on: https://gerrit.libreoffice.org/5588
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 86e3ead..4449181 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -403,6 +403,14 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos,
long nWidth, long nHe
longnLineWidthAry[100];
sal_uInt16 nLinePosAry[101];
+long nTotalWidth = nOffsetX;
+for( std::vectorImplTabItem::iterator it =
mpTabCtrlData-maItemList.begin();
+ it != mpTabCtrlData-maItemList.end(); ++it )
+{
+nTotalWidth += ImplGetItemSize( (*it), nMaxWidth ).Width();
+}
+long nWrapWidth = nWidth / ceil((double)nTotalWidth / nWidth);
+
nLineWidthAry[0] = 0;
nLinePosAry[0] = 0;
for( std::vectorImplTabItem::iterator it =
mpTabCtrlData-maItemList.begin();
@@ -410,18 +418,6 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos,
long nWidth, long nHe
{
aSize = ImplGetItemSize( (*it), nMaxWidth );
-if ( ((nX+aSize.Width()) nWidth - 2) (nWidth 2+nOffsetX) )
-{
-if ( nLines == 99 )
-break;
-
-nX = nOffsetX;
-nY += aSize.Height();
-nLines++;
-nLineWidthAry[nLines] = 0;
-nLinePosAry[nLines] = nPos;
-}
-
Rectangle aNewRect( Point( nX, nY ), aSize );
if ( mbSmallInvalidate (it-maRect != aNewRect) )
mbSmallInvalidate = sal_False;
@@ -436,6 +432,23 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos,
long nWidth, long nHe
nCurLine = nLines;
nPos++;
+
+if ( (nX nWrapWidth - 2) (nWidth 2+nOffsetX) )
+{
+if ( nLines == 99 )
+break;
+
+nX = nOffsetX;
+nY += aSize.Height();
+nLines++;
+nLineWidthAry[nLines] = 0;
+nLinePosAry[nLines] = nPos;
+}
+}
+
+if ( nX == nOffsetX )
+{
+nLines--;
}
if ( nLines !mpTabCtrlData-maItemList.empty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/source
sw/source/filter/ww8/hash_wrap.hxx |6 -
sw/source/filter/ww8/sortedarray.hxx |6 -
vcl/source/control/tabctrl.cxx | 140 ---
3 files changed, 119 insertions(+), 33 deletions(-)
New commits:
commit 55cdf3c5f44afe47cbe9eb32cc4f6fdcb6106d8d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 26 21:10:27 2013 +0100
most debug-level OUString::valueOf
Change-Id: I3e3cebe225e27a33be423c8b5fa2261b4a48e88c
diff --git a/sw/source/filter/ww8/hash_wrap.hxx
b/sw/source/filter/ww8/hash_wrap.hxx
index 189e4b1..55231b9 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -88,11 +88,11 @@ namespace ww
reinterpret_castconst sal_uInt8 *((*pIter));
for (size_t i=0; i nSize; ++i)
{
-sError += OUString::valueOf(
+sError += OUString::number(
static_castsal_Int32(pHack[i]), 16);
-sError += OUString::valueOf(sal_Unicode(' '));
+sError += OUString(' ');
}
-sError += OUString::valueOf(sal_Unicode('\n'));
+sError += OUString('\n');
while (*pIter == *(pIter+1) pIter pBeforeEnd)
++pIter;
}
diff --git a/sw/source/filter/ww8/sortedarray.hxx
b/sw/source/filter/ww8/sortedarray.hxx
index 9a596ed..5f975a7 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -85,11 +85,11 @@ namespace ww
reinterpret_castconst sal_uInt8 *((*pIter));
for (size_t i=0; i nSize; ++i)
{
-sError += OUString::valueOf(
+sError += OUString::number(
static_castsal_Int32(pHack[i]), 16);
-sError += OUString::valueOf(sal_Unicode(' '));
+sError += OUString(' ');
}
-sError += OUString::valueOf(sal_Unicode('\n'));
+sError += OUString('\n');
while (*pIter == *(pIter+1) pIter pBeforeEnd)
++pIter;
}
commit b224582aa3e7f0971035603515cf9c0e54ef299d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 26 21:08:47 2013 +0100
Related: fdo#66435 enhance decker-wrap using Minimum raggedness algo
Change-Id: Ifb7e6558d39499892a9e94bf1f89f014bacbdbc4
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 4449181..e6e4aba 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -339,7 +339,84 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long
nMaxWidth )
return aSize;
}
-// ---
+// Feel free to move this to some more general place for reuse
+// http://en.wikipedia.org/wiki/Word_wrap#Minimum_raggedness
+// Mostly based on Alexey Frunze's nifty example at
+//
http://stackoverflow.com/questions/9071205/balanced-word-wrap-minimum-raggedness-in-php
+namespace MinimumRaggednessWrap
+{
+std::dequesize_t GetEndOfLineIndexes(const std::vectorsal_Int32
rWidthsOf, sal_Int32 nLineWidth)
+{
+++nLineWidth;
+
+size_t nWidthsCount = rWidthsOf.size();
+std::vectorsal_Int32 aCosts(nWidthsCount * nWidthsCount);
+
+// cost function c(i, j) that computes the cost of a line consisting of
+// the words Word[i] to Word[j]
+for (size_t i = 0; i nWidthsCount; ++i)
+{
+for (size_t j = 0; j nWidthsCount; ++j)
+{
+if (j = i)
+{
+sal_Int32 c = nLineWidth - (j - i);
+for (size_t k = i; k = j; ++k)
+c -= rWidthsOf[k];
+c = (c = 0) ? c * c : SAL_MAX_INT32;
+aCosts[j * nWidthsCount + i] = c;
+}
+else
+{
+aCosts[j * nWidthsCount + i] = SAL_MAX_INT32;
+}
+}
+}
+
+std::vectorsal_Int32 aFunction(nWidthsCount);
+std::vectorsal_Int32 aWrapPoints(nWidthsCount);
+
+// f(j) in aFunction[], collect wrap points in aWrapPoints[]
+for (size_t j = 0; j nWidthsCount; ++j)
+{
+aFunction[j] = aCosts[j * nWidthsCount];
+if (aFunction[j] == SAL_MAX_INT32)
+{
+for (size_t k = 0; k j; ++k)
+{
+sal_Int32 s;
+if (aFunction[k] == SAL_MAX_INT32 || aCosts[j *
nWidthsCount + k + 1] == SAL_MAX_INT32)
+s = SAL_MAX_INT32;
+else
+s = aFunction[k] + aCosts[j *
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/asciiopt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3df4aba36c32291213a7fc811289ec573491dd3d
Author: Eike Rathke er...@redhat.com
Date: Mon Aug 26 22:15:46 2013 +0200
static
Change-Id: Idf997aedd4760f4adbf38064d53e1d6fe62f620f
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 2170a04..0232367 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -179,7 +179,7 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions rCmp
) const
return false;
}
-String lcl_decodeSepString( const String rSepNums, bool o_bMergeFieldSeps )
+static String lcl_decodeSepString( const String rSepNums, bool
o_bMergeFieldSeps )
{
String aFieldSeps;
xub_StrLen nSub = comphelper::string::getTokenCount( rSepNums, '/');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Re: [PATCH][RESEND] Writer - cross-references to numbered paragraphs still wrong (bug ID 36960)
On 17/08/13 05:06, Troy Rollo wrote: Bug 36960 was never fixed correctly (or rather, I suspect it was fixed, then broken when work was done to make the tests pass). The attached patch fixes the bug and adds new tests for cross-references to numbered paragraphs. hi Troy, thanks for the patch, have pushed it now to master (where it needed some adapting to recent OUString conversion changes) and libreoffice-4-1. sorry for not looking at this earlier, i'm afraid gerrit works so well that i rarely look for patches anywhere else :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/untbl.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 34f09dadd99a15aaad7fc8b982e01d6ec764c74c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 26 14:32:41 2013 +0100
Resolves: fdo#59048 crash on text-to-table undo
Delete the SwCellFrms attached to the layout of this SwTableNode early,
otherwise the SwCellFrms will dereference the SwTableNode after it is
deleted
in _DeleteBox during the DelFrms of the DeleteSection in _DeleteBox when
invalidating following SwFrms.
SwUndoInsTbl::UndoImpl calls SwTableNode::DelFrms so presumably this is the
right way to go about it.
Change-Id: I6e088a30500d721bd18c57ced5c8ec331bb567eb
Reviewed-on: https://gerrit.libreoffice.org/5634
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index a3793d2..4ed6fa7 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -734,6 +734,7 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext
rContext)
if( pDelBoxes )
{
+pTNd-DelFrms();
SwTable rTbl = pTNd-GetTable();
for( sal_uInt16 n = pDelBoxes-size(); n; )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/undo/untbl.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 2b27404184688cc5bdfd68ed15da5159950a318d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 26 14:32:41 2013 +0100
Resolves: fdo#59048 crash on text-to-table undo
Delete the SwCellFrms attached to the layout of this SwTableNode early,
otherwise the SwCellFrms will dereference the SwTableNode after it is
deleted
in _DeleteBox during the DelFrms of the DeleteSection in _DeleteBox when
invalidating following SwFrms.
SwUndoInsTbl::UndoImpl calls SwTableNode::DelFrms so presumably this is the
right way to go about it.
Change-Id: I6e088a30500d721bd18c57ced5c8ec331bb567eb
Reviewed-on: https://gerrit.libreoffice.org/5634
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 34f09dadd99a15aaad7fc8b982e01d6ec764c74c)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index a3793d2..4ed6fa7 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -734,6 +734,7 @@ void SwUndoTxtToTbl::UndoImpl(::sw::UndoRedoContext
rContext)
if( pDelBoxes )
{
+pTNd-DelFrms();
SwTable rTbl = pTNd-GetTable();
for( sal_uInt16 n = pDelBoxes-size(); n; )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndcopy.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 87cf1b730e771f18d5f0a110b98ffab6494d3b25
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Aug 25 22:20:16 2013 +0200
Fix iterator management
Change-Id: Ifb230525d3f5462553a3e78bb4ee740f6a7cc5c2
Reviewed-on: https://gerrit.libreoffice.org/5629
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index a23d4eb..fe9201b 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1469,8 +1469,9 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
// They are stored as matching the originals, so that we will be later
// able to build the chains accordingly.
::std::vector SwFrmFmt* aVecSwFrmFmt;
+::std::set _ZSortFly ::const_iterator it=aSet.begin();
-for (::std::set _ZSortFly ::const_iterator it=aSet.begin() ; it !=
aSet.end(); ++it )
+while (it != aSet.end())
{
// #i59964#
// correct determination of new anchor position
@@ -1570,7 +1571,9 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
rStartIdx.GetIndex() pSNd-EndOfSectionIndex() )
{
bMakeCpy = false;
-aSet.erase ( it );
+::std::set _ZSortFly ::const_iterator it_erase=it++;
+aSet.erase (it_erase);
+continue;
}
}
@@ -1578,6 +1581,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
if( bMakeCpy )
aVecSwFrmFmt.push_back( pDest-CopyLayoutFmt( *(*it).GetFmt(),
aAnchor, false, true ) );
+++it;
}
// Rebuild as much as possible of all chains that are available in the
original,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/glyphcache.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 1b1f49f5d6f9d45992b427d9b2a897e329c7b297
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Aug 25 20:24:24 2013 +0200
Simplify iterator management (part2)
Change-Id: Id4efe9b7c3831c09043644ad2445cd8f00aecd66
Reviewed-on: https://gerrit.libreoffice.org/5628
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/generic/glyphs/glyphcache.cxx
b/vcl/generic/glyphs/glyphcache.cxx
index 43c628d..f9a2ee3 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -363,18 +363,16 @@ GlyphData ServerFont::GetGlyphData( int nGlyphIndex )
void ServerFont::GarbageCollect( long nMinLruIndex )
{
-GlyphList::iterator it_next = maGlyphList.begin();
-while( it_next != maGlyphList.end() )
+GlyphList::iterator it = maGlyphList.begin();
+while( it != maGlyphList.end() )
{
-GlyphList::iterator it = it_next++;
GlyphData rGD = it-second;
if( (nMinLruIndex - rGD.GetLruValue()) 0 )
{
OSL_ASSERT( mnBytesUsed = sizeof(GlyphData) );
mnBytesUsed -= sizeof( GlyphData );
GlyphCache::GetInstance().RemovingGlyph( rGD );
-maGlyphList.erase( it );
-it_next = maGlyphList.begin();
+it = maGlyphList.erase( it );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/fwe/helper/propertysetcontainer.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit c6040d9bd4c631ebdaab9383d9ab4de0c26657ce
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:09:45 2013 +0200
Bin intermediate iterator + rename parameter function
(see example of http://www.cplusplus.com/reference/vector/vector/erase/)
Change-Id: I8c0ee334abd91ea99b80a43581a04cbbf9a91fa3
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx
b/framework/source/fwe/helper/propertysetcontainer.cxx
index a93c14f..52df1de 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -109,16 +109,14 @@ void SAL_CALL PropertySetContainer::insertByIndex(
sal_Int32 Index, const ::com:
throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this );
}
-void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index )
+void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
throw ( IndexOutOfBoundsException, WrappedTargetException,
RuntimeException )
{
ResetableGuard aGuard( m_aLock );
-if ( (sal_Int32)m_aPropertySetVector.size() Index )
+if ( (sal_Int32)m_aPropertySetVector.size() nIndex )
{
-PropertySetVector::iterator aIter = m_aPropertySetVector.begin();
-aIter += Index;
-m_aPropertySetVector.erase( aIter );
+m_aPropertySetVector.erase(m_aPropertySetVector.begin() + nIndex);
}
else
throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
eot embedded fonts
Hi all, One of the most commonly-occurring problems with .pub import is the fact that we don't respect embedded fonts. Now that LibreOffice supports embedded fonts, it should be possible to make this work. A few questions: (1) Do we support Embedded OpenType fonts currently? (.eot) (2) If not (which I suspect), I can contribute some code to do this. Microsoft and Monotype recently granted a perpetual, irrevocable free patent and copyright license to implement the .eot format, so there should be no legal issues. I have written a C library to convert from .eot to .ttf and would like to know who to talk to in order to get this included in LibreOffice. I can provide more details if anyone is interested. Cheers Brennan (2012 former gsoc student and main author of .pub import filter) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/vlc/vlcplayer.hxx|1
avmedia/source/vlc/wrapper/EventManager.cxx |7 -
avmedia/source/vlc/wrapper/Types.hxx| 38
3 files changed, 39 insertions(+), 7 deletions(-)
New commits:
commit ea12c1f1dedac1e42c6c91bf749aa409bd4504de
Author: Michael Meeks michael.me...@suse.com
Date: Tue Aug 27 05:22:18 2013 +0100
avmedia: vlc - extract required types to their own header.
Change-Id: I63d4aa217f57186ae37a9398b845fa734ef2cd5b
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 96dc646..de809f7 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -21,7 +21,6 @@
#define _VLCPLAYER_HXX
#include vlccommon.hxx
-#include vlc/vlc.h
#include boost/shared_ptr.hpp
#include cppuhelper/compbase2.hxx
#include com/sun/star/media/XPlayer.hpp
diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx
b/avmedia/source/vlc/wrapper/EventManager.cxx
index fe893c7..2edad30 100644
--- a/avmedia/source/vlc/wrapper/EventManager.cxx
+++ b/avmedia/source/vlc/wrapper/EventManager.cxx
@@ -7,15 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include vlc/libvlc.h
-#include vlc/libvlc_media.h
-#include vlc/libvlc_events.h
-
#include EventManager.hxx
#include SymbolLoader.hxx
#include EventHandler.hxx
-
-typedef void ( *libvlc_callback_t ) ( const struct libvlc_event_t *, void * );
+#include Types.hxx
namespace VLC
{
diff --git a/avmedia/source/vlc/wrapper/Types.hxx
b/avmedia/source/vlc/wrapper/Types.hxx
new file mode 100644
index 000..55257b6
--- /dev/null
+++ b/avmedia/source/vlc/wrapper/Types.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/* Typedefs and structures that represent the libvlc API / ABI */
+
+#ifndef _WRAPPER_TYPES_HXX
+#define _WRAPPER_TYPES_HXX
+
+extern C {
+
+// basic callback / event types we use
+typedef int libvlc_event_type_t;
+typedef struct libvlc_event_manager_t libvlc_event_manager_t;
+typedef void ( *libvlc_callback_t ) ( const struct libvlc_event_t *, void * );
+
+// the enumeration values we use cf. libvlc_events.h
+#define libvlc_MediaPlayerPaused 0x105
+#define libvlc_MediaPlayerEndReached 0x109
+
+// event structure pieces we use
+typedef struct libvlc_event_t
+{
+int type; // event type
+void *p_obj; // object emitting that event
+
+union // so far we don't need this.
+{
+ struct {
+const char *dummy1;
+const char *dummy2;
+ } padding;
+} u;
+} libvlc_event_t;
+
+}
+
+#endif // _WRAPPER_TYPES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/togglebuttontoolbarcontroller.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6ef19375b2a01e69ecd220e09bbc3abf55e34823
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:29:29 2013 +0200
Bin intermediate iterator
Change-Id: I6401adb29fc3fe4c8b7d420fc9bc325827ec4f21
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 8b7c899..f2aac68 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -242,9 +242,7 @@ void ToggleButtonToolbarController::executeControlCommand(
const ::com::sun::sta
{
if ( nPos sal_Int32( m_aDropdownMenuList.size() ))
{
-std::vector OUString ::iterator aIter =
m_aDropdownMenuList.begin();
-aIter += nPos;
-m_aDropdownMenuList.erase( aIter );
+
m_aDropdownMenuList.erase(m_aDropdownMenuList.begin() + nPos);
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/togglebuttontoolbarcontroller.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit a2791f974587301839a1dc59f632013b756fab83
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:30:54 2013 +0200
Bin intermediate iterator again
Change-Id: I6c3410e4043f6a10474f955434e8c855f60ecc80
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index f2aac68..dde2744 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -263,9 +263,7 @@ void ToggleButtonToolbarController::executeControlCommand(
const ::com::sun::sta
{
if ( m_aDropdownMenuList[j] == aText )
{
-std::vector OUString ::iterator aIter =
m_aDropdownMenuList.begin();
-aIter += j;
-m_aDropdownMenuList.erase( aIter );
+
m_aDropdownMenuList.erase(m_aDropdownMenuList.begin() + j);
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/fwi/uielement/itemcontainer.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 932dbfd2d12f5526e4d60fc4f17085872e6b8648
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:32:16 2013 +0200
Bin intermediate iterator + rename parameter function
Change-Id: Ic1055af502918ee754673a6e3ad704c55ef09a36
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx
b/framework/source/fwi/uielement/itemcontainer.cxx
index 956b277..2f9cce5 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -200,15 +200,13 @@ throw ( IllegalArgumentException,
IndexOutOfBoundsException, WrappedTargetExcept
(OWeakObject *)this, 2 );
}
-void SAL_CALL ItemContainer::removeByIndex( sal_Int32 Index )
+void SAL_CALL ItemContainer::removeByIndex( sal_Int32 nIndex )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
{
ShareGuard aLock( m_aShareMutex );
-if ( (sal_Int32)m_aItemVector.size() Index )
+if ( (sal_Int32)m_aItemVector.size() nIndex )
{
-std::vector Sequence PropertyValue ::iterator aIter =
m_aItemVector.begin();
-aIter += Index;
-m_aItemVector.erase( aIter );
+m_aItemVector.erase(m_aItemVector.begin() + nIndex);
}
else
throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailviewacc.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 591092d3f1409360be0be793462527b577539cc4
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:48:12 2013 +0200
Bin bool + transform while into for loop + add end iterator
Change-Id: I2661aab4f7a438586485b039033f7246b6f5e907
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index fc43115..21b15be 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -307,18 +307,17 @@ void SAL_CALL
ThumbnailViewAcc::removeAccessibleEventListener( const uno::Refere
if( rxListener.is() )
{
-std::vector uno::Reference accessibility::XAccessibleEventListener
::iterator aIter = mxEventListeners.begin();
-bool bFound = false;
+std::vector uno::Reference accessibility::XAccessibleEventListener
::const_iterator aEnd = mxEventListeners.end();
-while( !bFound ( aIter != mxEventListeners.end() ) )
+for (std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
+ aIter != aEnd;
+ ++aIter)
{
if( *aIter == rxListener )
{
mxEventListeners.erase( aIter );
-bFound = true;
+break;
}
-else
-++aIter;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailviewacc.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit ca1456d3c29483298a829be0f04decb5d894b585
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:51:10 2013 +0200
Bin bool + transform while into for loop + add end iterator (2)
Change-Id: Ic4b311c06b809507ac80de5df9851dc7f36c7caa
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 21b15be..b398186 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -823,18 +823,17 @@ void SAL_CALL
ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Re
if( rxListener.is() )
{
- ::std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
-sal_Bool bFound = sal_False;
+::std::vector uno::Reference accessibility::XAccessibleEventListener
::const_iterator aEnd = mxEventListeners.end();
-while( !bFound ( aIter != mxEventListeners.end() ) )
+for (::std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
+ aIter != aEnd;
+ ++aIter)
{
if( *aIter == rxListener )
{
mxEventListeners.erase( aIter );
-bFound = sal_True;
+break;
}
-else
-++aIter;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/graphicobject' - include/svtools svtools/source
include/svtools/grfmgr.hxx | 13 +-
svtools/source/graphic/grfmgr.cxx | 32 +++--
svtools/source/graphic/grfmgr2.cxx | 47 -
3 files changed, 47 insertions(+), 45 deletions(-)
New commits:
commit 0032b7ef849ae67b4b8f3fff7856b922d9e48cec
Author: Michael Meeks michael.me...@suse.com
Date: Tue Aug 27 05:56:06 2013 +0100
Cleanup referencing variously.
Change-Id: Ic31cad1ac2c28d79489f2fb3a49afc380778138c
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 6e62066..39558f3 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -614,22 +614,23 @@ private:
// Only used by GraphicObject's Ctor's and Dtor's
void SVT_DLLPRIVATE ImplRegisterObj(
-const rtl::Reference GraphicObject xObj,
+GraphicObject rObj,
Graphic rSubstitute,
const OString* pID = NULL
);
+
void SVT_DLLPRIVATE ImplUnregisterObj( const rtl::Reference GraphicObject
xObj );
inline sal_Bool SVT_DLLPRIVATE ImplHasObjects() const { return
!maObjList.empty(); }
// Only used in swap case by GraphicObject
-void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const rtl::Reference
GraphicObject xObj );
+void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( GraphicObject rObj );
sal_Bool SVT_DLLPRIVATE ImplFillSwappedGraphicObject(
-const rtl::Reference GraphicObject xObj,
+GraphicObject rObj,
Graphic rSubstitute
);
-void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const rtl::Reference
GraphicObject xObj );
+void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( GraphicObject rObj );
-OString SVT_DLLPRIVATE ImplGetUniqueID( const rtl::Reference
GraphicObject xObj ) const;
+OString SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject rObj ) const;
GraphicManager( sal_uLong nCacheSize = 1000UL,
sal_uLong nMaxObjCacheSize = 240UL );
@@ -658,7 +659,7 @@ public:
OutputDevice* pOut,
const Point rPt,
const Size rSz,
-rtl::Reference GraphicObject xObj,
+const rtl::Reference GraphicObject xObj,
const GraphicAttr rAttr,
const sal_uLong nFlags,
sal_Bool rCached
diff --git a/svtools/source/graphic/grfmgr.cxx
b/svtools/source/graphic/grfmgr.cxx
index 842e7f5..3aff3cc 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -70,7 +70,7 @@ GraphicObject::GraphicObject() :
ImplSetup();
}
-GraphicObject::GraphicObject( const Graphic rGraphic )
+GraphicObject::GraphicObject( const Graphic rGraphic ) :
maGraphic ( rGraphic ),
mpLink ( NULL ),
mpUserData ( NULL )
@@ -136,7 +136,7 @@ css::uno::Reference css::graphic::XGraphic SAL_CALL
GraphicObject::getGraphic
return GetGraphic().GetXGraphic();
}
-void SAL_CALL GraphicObject::setGraphic( const css::uno::Reference
css::graphic::XGraphic xGraphic )
+void SAL_CALL GraphicObject::setGraphic( const css::uno::Reference
css::graphic::XGraphic /* xGraphic */ )
throw( RuntimeException )
{
SolarMutexGuard aSolarGuard;
@@ -158,12 +158,7 @@ OUString SAL_CALL GraphicObject::getUniqueID()
GraphicObject::~GraphicObject()
{
if( mpMgr )
-{
-mpMgr-ImplUnregisterObj( *this );
-
-if( ( mpMgr == mpGlobalMgr ) !mpGlobalMgr-ImplHasObjects() )
-delete mpGlobalMgr, mpGlobalMgr = NULL;
-}
+mpMgr-ImplUnregisterObj( rtl::Reference GraphicObject ( this ) );
delete mpSwapOutTimer;
delete mpSwapStreamHdl;
@@ -483,7 +478,7 @@ void GraphicObject::GraphicManagerDestroyed()
}
sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point rPt, const
Size rSz,
- const GraphicAttr* pAttr, sal_uLong nFlags )
const
+ const GraphicAttr* pAttr, sal_uLong nFlags )
const
{
sal_Bool bRet;
@@ -497,7 +492,10 @@ sal_Bool GraphicObject::IsCached( OutputDevice* pOut,
const Point rPt, const Si
sal_BoolbRectClip;
ImplGetCropParams( pOut, aPt, aSz, pAttr, aClipPolyPoly, bRectClip
);
}
-bRet = mpMgr-IsInCache( pOut, aPt, aSz, *this, ( pAttr ? *pAttr :
GetAttr() ) );
+bRet = mpMgr-IsInCache( pOut, aPt, aSz,
+ rtl::Reference GraphicObject (
+const_cast GraphicObject *( this ) ),
+ ( pAttr ? *pAttr : GetAttr() ) );
}
else
bRet = sal_False;
@@
[Libreoffice-commits] core.git: framework/source
framework/source/fwi/uielement/rootitemcontainer.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 6a419ad8f23f9c3964309de42fefb652e37c6697
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 06:57:44 2013 +0200
Bin intermediate iterator
Change-Id: I49e6cd7bc6e4db95163d0b0b8c81bb4330ead081
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx
b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 021b79f..9091ce2 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -217,15 +217,13 @@ throw ( IllegalArgumentException,
IndexOutOfBoundsException, WrappedTargetExcept
(OWeakObject *)this, 2 );
}
-void SAL_CALL RootItemContainer::removeByIndex( sal_Int32 Index )
+void SAL_CALL RootItemContainer::removeByIndex( sal_Int32 nIndex )
throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
{
ShareGuard aLock( m_aShareMutex );
-if ( (sal_Int32)m_aItemVector.size() Index )
+if ( (sal_Int32)m_aItemVector.size() nIndex )
{
-std::vector Sequence PropertyValue ::iterator aIter =
m_aItemVector.begin();
-aIter += Index;
-m_aItemVector.erase( aIter );
+m_aItemVector.erase(m_aItemVector.begin() + nIndex);
}
else
throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/uno/unoimap.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit feb2604291c8b4710fd274307d50fba756cef277
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 07:09:15 2013 +0200
Replace for loop by std::advance + rename function parameter
Change-Id: I5d6615af2ed728be158edfe46b1c0fbadf7b3690
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 01e8b46..7071d86 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -647,13 +647,13 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32
Index, const Any Element
}
}
-void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 Index )
throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex )
throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
const sal_Int32 nCount = maObjectList.size();
-if( Index = nCount )
+if( nIndex = nCount )
throw IndexOutOfBoundsException();
-if( nCount - 1 == Index )
+if( nCount - 1 == nIndex )
{
maObjectList.back()-release();
maObjectList.pop_back();
@@ -661,8 +661,7 @@ void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 Index
) throw(IndexOutOfBo
else
{
std::list SvUnoImageMapObject* ::iterator aIter =
maObjectList.begin();
-for( sal_Int32 n = 0; n Index; n++ )
-++aIter;
+std::advance(aIter, nIndex);
(*aIter)-release();
maObjectList.erase( aIter );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/toolbarmenuacc.cxx | 24 +++-
svtools/source/control/valueacc.cxx | 26 --
2 files changed, 23 insertions(+), 27 deletions(-)
New commits:
commit 6ce6d0a41817c3eb9ec857c478c31594f0673735
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 07:18:56 2013 +0200
Bin bool + transform while into for loop + add end iterator (3)
Change-Id: I3d22eede61fb7ba15bac6f6130a7a60ec62170dc
diff --git a/svtools/source/control/toolbarmenuacc.cxx
b/svtools/source/control/toolbarmenuacc.cxx
index 8c35f91..1ad9cbf 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -330,18 +330,17 @@ void SAL_CALL
ToolbarMenuAcc::removeAccessibleEventListener( const Reference XA
if( rxListener.is() )
{
- EventListenerVector::iterator aIter = mxEventListeners.begin();
-bool bFound = false;
+EventListenerVector::const_iterator aEnd = mxEventListeners.end();
-while( !bFound ( aIter != mxEventListeners.end() ) )
+for(EventListenerVector::iterator aIter = mxEventListeners.begin();
+ aIter != aEnd;
+ ++aIter)
{
if( *aIter == rxListener )
{
-mxEventListeners.erase( aIter );
-bFound = true;
+mxEventListeners.erase(aIter);
+break;
}
-else
-++aIter;
}
}
}
@@ -832,18 +831,17 @@ void SAL_CALL
ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc
if( rxListener.is() )
{
- EventListenerVector::iterator aIter = mxEventListeners.begin();
-bool bFound = false;
+EventListenerVector::const_iterator aEnd = mxEventListeners.end();
-while( !bFound ( aIter != mxEventListeners.end() ) )
+for (EventListenerVector::iterator aIter = mxEventListeners.begin();
+ aIter != aEnd;
+ ++aIter)
{
if( *aIter == rxListener )
{
mxEventListeners.erase( aIter );
-bFound = true;
+break;
}
-else
-++aIter;
}
}
}
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index 985f9fb..e92b7ca 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -384,18 +384,17 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener(
const uno::Reference
if( rxListener.is() )
{
- ::std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
-sal_Bool bFound = sal_False;
+::std::vector uno::Reference accessibility::XAccessibleEventListener
::const_iterator aEnd = mxEventListeners.end();
-while( !bFound ( aIter != mxEventListeners.end() ) )
+for(::std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
+ aIter != aEnd;
+ ++aIter)
{
if( *aIter == rxListener )
{
-mxEventListeners.erase( aIter );
-bFound = sal_True;
+mxEventListeners.erase(aIter);
+break;
}
-else
-++aIter;
}
}
}
@@ -1048,18 +1047,17 @@ void SAL_CALL
ValueItemAcc::removeAccessibleEventListener( const uno::Reference
if( rxListener.is() )
{
- ::std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
-sal_Bool bFound = sal_False;
+::std::vector uno::Reference accessibility::XAccessibleEventListener
::const_iterator aEnd = mxEventListeners.end();
-while( !bFound ( aIter != mxEventListeners.end() ) )
+for(::std::vector uno::Reference
accessibility::XAccessibleEventListener ::iterator aIter =
mxEventListeners.begin();
+ aIter != aEnd;
+ ++aIter)
{
if( *aIter == rxListener )
{
-mxEventListeners.erase( aIter );
-bFound = sal_True;
+mxEventListeners.erase(aIter);
+break;
}
-else
-++aIter;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/hangulhanjadlg.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit ed5dc65079c27d6db8f9cb4b0bf4a907ecf041af
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 27 07:31:11 2013 +0200
Bin intermediate iterator
Change-Id: I377e226820f5e4626d4341b216ff75f755dded5b
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 28bcd89..39bcbf7 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1086,9 +1086,8 @@ namespace svx
xNameCont-removeByName( xDic-getName() );
//adapt local caches:
-HHDictList::iterator aIter(m_aDictList.begin());
-m_aDictList.erase(aIter+nSelPos );
-m_aDictsLB.RemoveEntry( nSelPos );
+m_aDictList.erase(m_aDictList.begin()+nSelPos );
+m_aDictsLB.RemoveEntry(nSelPos);
}
catch( const ElementExistException )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/windows/property.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit fb0bc00e48666c5e2863a9e78623460ee54215cc
Author: Andras Timar ati...@suse.com
Date: Mon Aug 26 12:57:22 2013 -0700
fdo#64053 do not let too long comment in ARP Comment field
Change-Id: Ica8e113b2f1aa22a426801bc75df68c02d952ed3
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 2244c8b..5bd2508 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -49,6 +49,7 @@ sub get_arpcomments_for_property_table
my $languagestring = $$languagestringref;
$languagestring =~ s/\_/\,/g;
+if ( length($languagestring) 30 ) { $languagestring = multilanguage; }
# fdo#64053
$comment = $comment . ($languagestring);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Inherited from OOo Version
On Sat, 24 Aug 2013 14:31:43 +0200, Tommy ba...@quipo.it wrote: what about new feature requests? let's say I wanna open a Bug WXYZ - make coffee :-) should we label this as inherited from LibO or to 3.3.0 IMHO if it's a bug right label is inherited from LibO while a new feature should be 3.3.0. what do you think about it I hade some more thoughts about this and probably to keep things simpler it's better to label them all as inherited from LibO regardless they are bugs or feature requests. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Portuguese (BR-PT) Bug Triage Wiki Translation
Hi All, Not sure if anyone from the Brazillian Portuguese team scours the English QA mailing list but I'm hoping to see if we can find some volunteers to translate the English bug triage wiki to BR-PT. https://wiki.documentfoundation.org/QA/BugTriage Not to say that everything needs translated but I think that the current BR-PT one is missing a lot of useful information. The reason why I specifically ask about this one is because down the line I believe that the next (if there is a next) localized BSA will be BR-PT. We may want a clear and concise instructions on how to bug triage. Also I think that the BR-PT community is one of the larger localized community, so hopefully finding a translator or two is not too difficult. Again, not saying copy word for word (although you can if you think the English one is good enough), just thinking it may need substantially expanded on and clarified. Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] QA Meeting Minutes - 2013-08-23
(*) Florian R. - If new repo -- Include older versions!! (*) Bjoern - Including older versions would expand the repository and make the initial download size much larger (might be scary for first-time QA members?) Perhaps we could get a lot of the benefit of the older versions from just a few of them. We would not be able to locate a regression with precision, but that could be a good tradeoff. Of course, the oldest version found in the bibisect40 repositiory and the earliest runnable version of LibreOffice would be particularly interesting. Terry. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 67232] [FORMATTING] Finer resolution for label template dimensions
https://bugs.freedesktop.org/show_bug.cgi?id=67232 --- Comment #1 from Ben qwertym...@yahoo.com --- If Writer's unit of measurement is set to metric (ToolsOptionsLibreOffice WriterGeneral), label templates can be created with a granularity of 0.01mm, which is finer than 0.001, and it works just fine, so Writer is definitely able to handle that fine of measurements, it's just a matter of how the dimensions are stored. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64856] UI: Navigation toolbar does not stick
https://bugs.freedesktop.org/show_bug.cgi?id=64856 Kumāra kumara.bhik...@gmail.com changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) OS|All |Windows (All) --- Comment #2 from Kumāra kumara.bhik...@gmail.com --- Thanks for the attention. The issue remains in my LO 4.1.0.4 under Win7 64bit. I've found a workaround though: Add the 2 icons in a custom toolbar. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68555] New: UI: Inconsistent Position of OK Button [ANNOYING!]
https://bugs.freedesktop.org/show_bug.cgi?id=68555 Priority: medium Bug ID: 68555 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Inconsistent Position of OK Button [ANNOYING!] Severity: normal Classification: Unclassified OS: All Reporter: kumara.bhik...@gmail.com Hardware: All Status: NEW Version: 4.1.0.4 release Component: Spreadsheet Product: LibreOffice It's annoying to click on a button that my mind has been programmed to think it's the OK button, then the Help window pops up! Then I've to close the unwanted window, see where the OK button really is, and click again. I think somebody recently moved the buttons, since I've encountered this dialog box many times before and never faced this problem till now. When an LO dialog box has its buttons at the bottom, the OK button is universally on the left most, EXCEPT for the Text Import dialog box, where it is on right most. To activate that dialog box, 1. Copy a few lines of text, e.g.: ch.j...@yaaho.com la...@yaaho.com k...@yaaho.com [not real addresses] 2. Paste (Ctrl-V) on an empty cell in Calc. Notice the position of boxes below, and compare them with other dialog boxes. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 63800] EDITING: Input fields in write protected sections not update in window when edited
https://bugs.freedesktop.org/show_bug.cgi?id=63800 IT bughun...@stadur.de changed: What|Removed |Added Priority|low |medium CC||bughun...@stadur.de --- Comment #1 from IT bughun...@stadur.de --- I can confirm this bug still exists with version 4.0.4 4.0.5 and 4.1.1 RC2 Windows 7 x64 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48164] VIEWING: in PPS presentation slide transition looks wrong on Linux
https://bugs.freedesktop.org/show_bug.cgi?id=48164 --- Comment #6 from sasha.libreoff...@gmail.com --- in 4.1 still crashes (installed from RPM downloaded form libreoffice.org) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45146] EDITING: references in formulas do not follow referenced values to new location during sort
https://bugs.freedesktop.org/show_bug.cgi?id=45146 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added CC||abstro...@gmail.com --- Comment #13 from Winfried Donkers winfrieddonk...@libreoffice.org --- *** Bug 43004 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 43004] EDITING: Cell references modified wrongly after horizontal sort
https://bugs.freedesktop.org/show_bug.cgi?id=43004 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #6 from Winfried Donkers winfrieddonk...@libreoffice.org --- Although this bug report is older than bug 45146, lots of other bug reports have been marked as duplicates of bug 45146, making bug 45146 more appropiate to act as the central report. *** This bug has been marked as a duplicate of bug 45146 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68556] New: EDITING: Enhancement: Enable moving of cell comments by up/down/left/right keys
https://bugs.freedesktop.org/show_bug.cgi?id=68556 Priority: medium Bug ID: 68556 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Enhancement: Enable moving of cell comments by up/down/left/right keys Severity: normal Classification: Unclassified OS: All Reporter: bugquestcon...@online.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.0.5.2 rc Component: Spreadsheet Product: LibreOffice Problem description: When there is need to arrange many cell comments on a rather small area of a spreadsheet, it would be easier (=faster) to do this work if the comments could be moved by up/down/left/right keys especially in combination with ALT key to enable smaller steps per key stroke Therefor the request is to enable moving of cell comments by up/down/left/right keys in combination with ALT-key for smaller steps Operating System: All Version: 4.0.5.2 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68556] EDITING: Enhancement: Enable moving of cell comments by up/down/left/right keys
https://bugs.freedesktop.org/show_bug.cgi?id=68556 bugquestcon...@online.de changed: What|Removed |Added Severity|normal |enhancement -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45146] EDITING: references in formulas do not follow referenced values to new location during sort
https://bugs.freedesktop.org/show_bug.cgi?id=45146 --- Comment #14 from Winfried Donkers winfrieddonk...@libreoffice.org --- Created attachment 84629 -- https://bugs.freedesktop.org/attachment.cgi?id=84629action=edit file with 3 different behaviours when sorting attached file shows 3 different behaviours, of which only one looks acceptable: -open document -step 1: sort A8:B13 on column B; A8:A13 now show wrong values -step 2: sort A16:B21 on column B: A15:A21 keep the correct values -step 3: undo step 1 and 2; sort A1:B5 on column B; both A8:A13 and A16:A21 now show wrong values -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45146] EDITING: references in formulas do not follow referenced values to new location during sort
https://bugs.freedesktop.org/show_bug.cgi?id=45146 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added Version|3.6.5.2 release |Inherited From OOo --- Comment #15 from Winfried Donkers winfrieddonk...@libreoffice.org --- changed the version as this bug has always been present in LibreOffice -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68555] UI: Inconsistent Position of OK Button [ANNOYING!]
https://bugs.freedesktop.org/show_bug.cgi?id=68555 Emir Sarı emir_s...@msn.com changed: What|Removed |Added QA Contact||emir_s...@msn.com CC||caol...@redhat.com --- Comment #1 from Emir Sarı emir_s...@msn.com --- Could not reproduce the issue myself on the latest master, but; Caolan, adding you to CC, maybe you have info about the matter. Kumāra, could you give more info about how to get that dialog box again? Or a screenshot would be useful. Thanks in advance. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56262] title is not copied correctly formatted
https://bugs.freedesktop.org/show_bug.cgi?id=56262 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME --- Comment #5 from tommy27 ba...@quipo.it --- nice to hear that. marking as RESOLVED WORKSFORME -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49853] EDITING: Pasting into find bar with Edit:Paste (or Cmd-V on OS X) pastes into document
https://bugs.freedesktop.org/show_bug.cgi?id=49853 Tor Lillqvist t...@iki.fi changed: What|Removed |Added OS|Mac OS X (All) |All Summary|EDITING: Pasting into 'any' |EDITING: Pasting into find |toolbar box with CMD+V (OS |bar with Edit:Paste (or |X) overwrites (destroys)|Cmd-V on OS X) pastes into |unrelated data |document --- Comment #53 from Tor Lillqvist t...@iki.fi --- Actually, I would say that the same bug *does* exist also on Linux, but it has to be invoked in a different way: You have to use Edit:Paste while the findbar's text input field has focus, that causes a paste into the document, not into the findbar. (Control-V works as expected, pastes into the findbar.) Most likely fixing that on Linux will fix the behaviour on OS X, too. I think that unlike on Linux, on OS X an accelerator like Command-V is more tightly coupled to actually work as if the corresponding menu entry was selected. (This is obvious from the fact that in OS X (in all applications, not just LibreOffice), when pressing for instance Command-V, one sees the Edit menu entry highlight for a moment.) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
