[Libreoffice-commits] .: postprocess/signing
postprocess/signing/signing.pl | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 549b5d030ab60dbf6d0279634b22702e70078dd8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 7 09:18:42 2012 +0100
Allow signing of dlls and exes with default certificate without password
Change-Id: Ic39276df49cb317936baf7956dd74a1a7f42cbff
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 846ac00..6f8b26a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -47,7 +47,7 @@ if ( $#ARGV 2 ) {
exit(1);
}
@args = parse_options();
-get_exclude_files();
+get_exclude_files() if ($opt_exclude != );
@files_to_sign = get_files(\@args);
if ( $opt_log ) { # logging
open(LOG,$opt_log) || die Can't open log file $opt_log\n;
@@ -78,11 +78,6 @@ sub parse_options #09.07.2007 08:13
usage();
exit(1);
}
-if ( !$opt_exclude || !$opt_pfxfile || !$opt_pass || !$opt_timestamp_url) {
-print ERROR: Parameter missing!\n!;
-usage();
-exit(1);
-}
return @ARGV;
} ##parse_options
@@ -142,8 +137,6 @@ sub sign_files #09.07.2007 10:36
my $file = ;
my $result = ;
-print_error(Can't open PFX file: $opt_pfxfile\n) if ( ! -e $opt_pfxfile
);
-print_error(Password is empty\n) if ( !$opt_pass );
if ( $opt_pass =~ /\.exe$/ ) {
# get password by tool
open(PIPE, $opt_pass 21 |) || die Can't open PIPE!\n;
@@ -153,7 +146,10 @@ sub sign_files #09.07.2007 10:36
$opt_pass = $pass;
}
$signtool .= -v if ($opt_verbose);
-$commandline_base = $signtool . . -f $opt_pfxfile -p $opt_pass -t
$opt_timestamp_url;
+$commandline_base = $signtool;
+$commandline_base .= -f $opt_pfxfile if ($opt_pfxfile != );
+$commandline_base .= -p $opt_pass if ($opt_pass != );
+$commandline_base .= -t $opt_timestamp_url if ($opt_timestamp_url !=
);
# Here switch between:
# one command line for muliple files (all doesn't work, too much) / for
each file one command line
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - postprocess/signing
postprocess/signing/signing.pl | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit ae7bd9518db7e2ace69f3d4f7619ac107722e6b5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 7 09:18:42 2012 +0100
Allow signing of dlls and exes with default certificate without password
Change-Id: Ic39276df49cb317936baf7956dd74a1a7f42cbff
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 846ac00..6f8b26a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -47,7 +47,7 @@ if ( $#ARGV 2 ) {
exit(1);
}
@args = parse_options();
-get_exclude_files();
+get_exclude_files() if ($opt_exclude != );
@files_to_sign = get_files(\@args);
if ( $opt_log ) { # logging
open(LOG,$opt_log) || die Can't open log file $opt_log\n;
@@ -78,11 +78,6 @@ sub parse_options #09.07.2007 08:13
usage();
exit(1);
}
-if ( !$opt_exclude || !$opt_pfxfile || !$opt_pass || !$opt_timestamp_url) {
-print ERROR: Parameter missing!\n!;
-usage();
-exit(1);
-}
return @ARGV;
} ##parse_options
@@ -142,8 +137,6 @@ sub sign_files #09.07.2007 10:36
my $file = ;
my $result = ;
-print_error(Can't open PFX file: $opt_pfxfile\n) if ( ! -e $opt_pfxfile
);
-print_error(Password is empty\n) if ( !$opt_pass );
if ( $opt_pass =~ /\.exe$/ ) {
# get password by tool
open(PIPE, $opt_pass 21 |) || die Can't open PIPE!\n;
@@ -153,7 +146,10 @@ sub sign_files #09.07.2007 10:36
$opt_pass = $pass;
}
$signtool .= -v if ($opt_verbose);
-$commandline_base = $signtool . . -f $opt_pfxfile -p $opt_pass -t
$opt_timestamp_url;
+$commandline_base = $signtool;
+$commandline_base .= -f $opt_pfxfile if ($opt_pfxfile != );
+$commandline_base .= -p $opt_pass if ($opt_pass != );
+$commandline_base .= -t $opt_timestamp_url if ($opt_timestamp_url !=
);
# Here switch between:
# one command line for muliple files (all doesn't work, too much) / for
each file one command line
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.ac postprocess/signing
config_host.mk.in |1 + configure.ac| 18 ++ postprocess/signing/makefile.mk |8 3 files changed, 23 insertions(+), 4 deletions(-) New commits: commit ebff822d9338eb8739922d5b18baef875ba8d966 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 7 09:40:39 2012 +0100 Add --enable-windows-build-signing option Change-Id: I9630a486043c97aa9e31873c63f807cedb869a24 diff --git a/config_host.mk.in b/config_host.mk.in index 04b1575..12a0752 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -583,6 +583,7 @@ export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@ export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@ export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@ export WGET=@WGET@ +export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDRES=@WINDRES@ diff --git a/configure.ac b/configure.ac index add8364..8186eb6 100644 --- a/configure.ac +++ b/configure.ac @@ -1059,6 +1059,11 @@ AC_ARG_ENABLE(release-build, See http://wiki.documentfoundation.org/DevBuild]), ,) +AC_ARG_ENABLE(windows-build-signing, +AS_HELP_STRING([--enable-windows-build-signing], +[Enable signing of windows binaries (*.exe, *.dll)]), +,) + AC_ARG_ENABLE(silent-msi, AS_HELP_STRING([--enable-silent-msi], [Enable MSI with LIMITUI=1 (silent install).]), @@ -2106,6 +2111,19 @@ fi AC_SUBST(ENABLE_RELEASE_BUILD) dnl === +dnl Test whether to sign Windows Build +dnl === +AC_MSG_CHECKING([whether to sign windows build]) +if test $enable_windows_build_signing = yes -a $_os = WINNT -a $WITH_MINGW != YES ; then +AC_MSG_RESULT([yes]) +WINDOWS_BUILD_SIGNING=TRUE +else +AC_MSG_RESULT([no]) +WINDOWS_BUILD_SIGNING=FALSE +fi +AC_SUBST(WINDOWS_BUILD_SIGNING) + +dnl === dnl MacOSX build and runtime environment options dnl === diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk index b60fc2e..066927a 100644 --- a/postprocess/signing/makefile.mk +++ b/postprocess/signing/makefile.mk @@ -33,7 +33,7 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll $(SOLARBINDIR)$/*.exe TIMESTAMPURL*=http://timestamp.verisign.com/scripts/timstamp.dll; signing.done : -.IF $(VISTA_SIGNING)!= +.IF $(WINDOWS_BUILD_SIGNING)==TRUE .IF $(COM)==MSC .IF $(product)==full $(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) $(TOUCH) $(MISC)$/signing.done @@ -43,9 +43,9 @@ signing.done : .ELSE # $(GUI)==MSC @echo Nothing to do, signing is Windows \(MSC\) only. .ENDIF # $(GUI)==MSC -.ELSE # $(VISTA_SIGNING)!= -@echo Doing nothing. To switch on signing set VISTA_SIGNING=TRUE ... -.ENDIF # $(VISTA_SIGNING)!= +.ELSE # $(WINDOWS_BUILD_SIGNING)==TRUE +@echo Doing nothing. Windows build signing is disabled ... +.ENDIF # $(WINDOWS_BUILD_SIGNING)==TRUE .INCLUDE : target.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac postprocess/signing
config_host.mk.in |1 + configure.ac| 18 ++ postprocess/signing/makefile.mk |8 3 files changed, 23 insertions(+), 4 deletions(-) New commits: commit d25f291000b37d52c24321972633a46d53645a5b Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 7 09:40:39 2012 +0100 Add --enable-windows-build-signing option Change-Id: I9630a486043c97aa9e31873c63f807cedb869a24 Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/config_host.mk.in b/config_host.mk.in index 04b1575..12a0752 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -583,6 +583,7 @@ export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@ export VISIO_LIBS=$(gb_SPACE)@VISIO_LIBS@ export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@ export WGET=@WGET@ +export WINDOWS_BUILD_SIGNING=@WINDOWS_BUILD_SIGNING@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDRES=@WINDRES@ diff --git a/configure.ac b/configure.ac index b8b38a7..ad5e9f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1065,6 +1065,11 @@ AC_ARG_ENABLE(release-build, See http://wiki.documentfoundation.org/DevBuild]), ,) +AC_ARG_ENABLE(windows-build-signing, +AS_HELP_STRING([--enable-windows-build-signing], +[Enable signing of windows binaries (*.exe, *.dll)]), +,) + AC_ARG_ENABLE(silent-msi, AS_HELP_STRING([--enable-silent-msi], [Enable MSI with LIMITUI=1 (silent install).]), @@ -2112,6 +2117,19 @@ fi AC_SUBST(ENABLE_RELEASE_BUILD) dnl === +dnl Test whether to sign Windows Build +dnl === +AC_MSG_CHECKING([whether to sign windows build]) +if test $enable_windows_build_signing = yes -a $_os = WINNT -a $WITH_MINGW != YES ; then +AC_MSG_RESULT([yes]) +WINDOWS_BUILD_SIGNING=TRUE +else +AC_MSG_RESULT([no]) +WINDOWS_BUILD_SIGNING=FALSE +fi +AC_SUBST(WINDOWS_BUILD_SIGNING) + +dnl === dnl MacOSX build and runtime environment options dnl === diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk index b60fc2e..066927a 100644 --- a/postprocess/signing/makefile.mk +++ b/postprocess/signing/makefile.mk @@ -33,7 +33,7 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll $(SOLARBINDIR)$/*.exe TIMESTAMPURL*=http://timestamp.verisign.com/scripts/timstamp.dll; signing.done : -.IF $(VISTA_SIGNING)!= +.IF $(WINDOWS_BUILD_SIGNING)==TRUE .IF $(COM)==MSC .IF $(product)==full $(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) $(TOUCH) $(MISC)$/signing.done @@ -43,9 +43,9 @@ signing.done : .ELSE # $(GUI)==MSC @echo Nothing to do, signing is Windows \(MSC\) only. .ENDIF # $(GUI)==MSC -.ELSE # $(VISTA_SIGNING)!= -@echo Doing nothing. To switch on signing set VISTA_SIGNING=TRUE ... -.ENDIF # $(VISTA_SIGNING)!= +.ELSE # $(WINDOWS_BUILD_SIGNING)==TRUE +@echo Doing nothing. Windows build signing is disabled ... +.ENDIF # $(WINDOWS_BUILD_SIGNING)==TRUE .INCLUDE : target.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postprocess/signing
postprocess/signing/signing.pl |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit a69efa6e2b1b207b78608861c1cb5d8aadda3150
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 7 09:47:55 2012 +0100
Make the usage notice correspond to reality
Change-Id: I4142af0181629c627e1137ce406249040f28e51f
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 6f8b26a..b937f0e 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -236,15 +236,12 @@ sub print_error #09.07.2007 11:21
sub usage #09.07.2007 08:39
{
-print Usage:\t $myname -e filename -f filename -p password -t
timestamp [-l filename] [-v] file[list] \n;
+print Usage:\t $myname [-e filename] [-f filename] [-p password] [-t
timestamp] [-l filename] [-v] file[list] \n;
print Options:\n;
print \t -e filename\t\t\tFile which contains a list of files which don't
have to be signed.\n;
-printMandatory.\n;
-print \t -f pfx_filename\t\t\Personal Information Exchange\ file. ;
-printMandatory.\n;
-print \t -p password\t\t\tPassword for \Personal Information Exchange\
file. Mandatory.\n;
+print \t -f pfx_filename\t\t\Personal Information Exchange\ file.\n;
+print \t -p password\t\t\tPassword for \Personal Information Exchange\
file.\n;
print \t -t timestamp\t\t\tTimestamp URL e.g.
\http://timestamp.verisign.com/scripts/timstamp.dll\\n;;
-print \t\t\t\t\tMandatory.\n;
print \t -l log_filename\t\tFile for logging.\n;
print \t -v\t\t\t\tVerbose.\n;
} ##usage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - postprocess/signing
postprocess/signing/signing.pl |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 4febcd3728612e811a8f525c50a298214cc1dedd
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Dec 7 09:47:55 2012 +0100
Make the usage notice correspond to reality
Change-Id: I4142af0181629c627e1137ce406249040f28e51f
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 6f8b26a..b937f0e 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -236,15 +236,12 @@ sub print_error #09.07.2007 11:21
sub usage #09.07.2007 08:39
{
-print Usage:\t $myname -e filename -f filename -p password -t
timestamp [-l filename] [-v] file[list] \n;
+print Usage:\t $myname [-e filename] [-f filename] [-p password] [-t
timestamp] [-l filename] [-v] file[list] \n;
print Options:\n;
print \t -e filename\t\t\tFile which contains a list of files which don't
have to be signed.\n;
-printMandatory.\n;
-print \t -f pfx_filename\t\t\Personal Information Exchange\ file. ;
-printMandatory.\n;
-print \t -p password\t\t\tPassword for \Personal Information Exchange\
file. Mandatory.\n;
+print \t -f pfx_filename\t\t\Personal Information Exchange\ file.\n;
+print \t -p password\t\t\tPassword for \Personal Information Exchange\
file.\n;
print \t -t timestamp\t\t\tTimestamp URL e.g.
\http://timestamp.verisign.com/scripts/timstamp.dll\\n;;
-print \t\t\t\t\tMandatory.\n;
print \t -l log_filename\t\tFile for logging.\n;
print \t -v\t\t\t\tVerbose.\n;
} ##usage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source postprocess/signing
connectivity/source/inc/odbc/OResultSet.hxx | 10 +- postprocess/signing/makefile.mk |2 +- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 113379e0507e83d3336993d79a49abc75928b42d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 7 10:08:35 2012 +0100 We definitely want a log file to check in case something goes wrong Change-Id: Ie8ab243e72decae63717cf78d8e7038a74b4c1ae diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk index 066927a..c9245d0 100644 --- a/postprocess/signing/makefile.mk +++ b/postprocess/signing/makefile.mk @@ -36,7 +36,7 @@ signing.done : .IF $(WINDOWS_BUILD_SIGNING)==TRUE .IF $(COM)==MSC .IF $(product)==full -$(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) $(TOUCH) $(MISC)$/signing.done +$(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) $(TOUCH) $(MISC)$/signing.done .ELSE # $(product)==full @echo Doing nothing on non product builds ... .ENDIF # $(product)==full commit 06fa6ebbd5f7e3943afbf3552d31cdc0d1edb31a Author: Noel Grandin n...@peralex.com Date: Fri Dec 7 11:06:55 2012 +0200 fix missing SAL_CALL attributes Change-Id: Ibdf93f27f08d4a76867c6871557d2d4967e7b9a5 diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index c6ef45b..db2e94a 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -182,11 +182,11 @@ namespace connectivity // for simple cases template typename T T impl_getValue( const sal_Int32 _nColumnIndex, SQLSMALLINT nType ); // these cases need some special treatment -sal_Bool impl_getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); -::com::sun::star::uno::Sequence sal_Int8 impl_getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); -::com::sun::star::util::Date impl_getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); -::com::sun::star::util::Time impl_getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); -::com::sun::star::util::DateTime impl_getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); +sal_Bool SAL_CALL impl_getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); +::com::sun::star::uno::Sequence sal_Int8 SAL_CALL impl_getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); +::com::sun::star::util::Date SAL_CALL impl_getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); +::com::sun::star::util::Time SAL_CALL impl_getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); +::com::sun::star::util::DateTime SAL_CALL impl_getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int64 SAL_CALL impl_getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL impl_getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequencesal_Int8 SAL_CALL impl_getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - postprocess/signing
postprocess/signing/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3fa9c42d451435fb2af2125acce6edd132a4d9e7 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Dec 7 10:08:35 2012 +0100 We definitely want a log file to check in case something goes wrong Change-Id: Ie8ab243e72decae63717cf78d8e7038a74b4c1ae Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk index 066927a..c9245d0 100644 --- a/postprocess/signing/makefile.mk +++ b/postprocess/signing/makefile.mk @@ -36,7 +36,7 @@ signing.done : .IF $(WINDOWS_BUILD_SIGNING)==TRUE .IF $(COM)==MSC .IF $(product)==full -$(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) $(TOUCH) $(MISC)$/signing.done +$(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) $(TOUCH) $(MISC)$/signing.done .ELSE # $(product)==full @echo Doing nothing on non product builds ... .ENDIF # $(product)==full ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [API] Some more cleanup ideas
On 12/06/2012 07:51 PM, Thorsten Behrens wrote:
For large parts of UNO, making one not violate the exception
specification, would look like this:
try {
functions
} catch(...) {
throw uno::RuntimeException(Arrgh! General $FOO error!!1!);
}
That is not what I would call error handling.
But that problem would not be solved just by removing dynamic exception
specifications from C++ code.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/rtf/swparrtf.cxx | 48 --
sw/source/filter/rtf/swparrtf.hxx |7 -
2 files changed, 55 deletions(-)
New commits:
commit 8dd1581a4f65eacc2a0f62b79873b533e8237a43
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 7 10:13:06 2012 +0100
sw: unused RtfReader
diff --git a/sw/source/filter/rtf/swparrtf.cxx
b/sw/source/filter/rtf/swparrtf.cxx
index 13216ca..75f0a45 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -225,54 +225,6 @@ extern C SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL
ImportRTF()
return new SwRTFReader();
}
-// Aufruf fuer die allg. Reader-Schnittstelle
-sal_uLong RtfReader::Read( SwDoc rDoc, const String rBaseURL, SwPaM rPam,
const String )
-{
-if( !pStrm )
-{
-OSL_FAIL( RTF-Read ohne Stream );
-return ERR_SWG_READ_ERROR;
-}
-
-if( !bInsertMode )
-{
-// MIB 27.09.96: Umrandung uns Abstaende aus Frm-Vorlagen entf.
-Reader::ResetFrmFmts( rDoc );
-}
-
-sal_uLong nRet = 0;
-SwDocShell *pDocShell(rDoc.GetDocShell());
-OSL_ENSURE(pDocShell, no SwDocShell);
-uno::Referencedocument::XDocumentProperties xDocProps;
-if (pDocShell) {
-uno::Referencedocument::XDocumentPropertiesSupplier xDPS(
-pDocShell-GetModel(), uno::UNO_QUERY_THROW);
-xDocProps.set(xDPS-getDocumentProperties());
-}
-
-SvParserRef xParser = new SwRTFParser( rDoc, xDocProps,
-rPam, *pStrm, rBaseURL, !bInsertMode );
-SvParserState eState = xParser-CallParser();
-if( SVPAR_PENDING != eState SVPAR_ACCEPTED != eState )
-{
-String sErr( String::CreateFromInt32( xParser-GetLineNr() ));
-sErr += ',';
-sErr += String::CreateFromInt32( xParser-GetLinePos() );
-
-nRet = *new StringErrorInfo( ERR_FORMAT_ROWCOL, sErr,
-ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
-}
-
-
-return nRet;
-}
-
-sal_uLong RtfReader::Read(SvStream* pStream, SwDoc rDoc, const String
rBaseURL, SwPaM rPam)
-{
-pStrm = pStream;
-return Read(rDoc, rBaseURL, rPam, rBaseURL);
-}
-
SwRTFParser::SwRTFParser(SwDoc* pD,
uno::Referencedocument::XDocumentProperties i_xDocProps,
const SwPaM rCrsr, SvStream rIn, const String rBaseURL,
diff --git a/sw/source/filter/rtf/swparrtf.hxx
b/sw/source/filter/rtf/swparrtf.hxx
index b60dc50..1ff1cbf 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -57,13 +57,6 @@ class SwNodeNum;
class SwTxtNode;
struct SvxRTFPictureType;
-class RtfReader: public Reader
-{
-virtual sal_uLong Read( SwDoc , const String rBaseURL, SwPaM ,const
String );
-public:
-virtual sal_uLong Read( SvStream* pStrm, SwDoc , const String rBaseURL,
SwPaM );
-};
-
class SwNodeIdx : public SvxNodeIdx
{
SwNodeIndex aIdx;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source sd/source sfx2/inc sfx2/source starmath/inc starmath/source sw/source
sc/source/ui/inc/prevwsh.hxx|3 ++-
sc/source/ui/inc/tabvwsh.hxx|1 +
sc/source/ui/view/prevwsh.cxx |5 +
sc/source/ui/view/tabvwsh4.cxx |5 +
sd/source/ui/inc/ViewShellBase.hxx |5 -
sd/source/ui/view/ViewShellBase.cxx | 12
sfx2/inc/sfx2/viewsh.hxx|3 ++-
sfx2/source/view/viewprn.cxx|7 ++-
starmath/inc/view.hxx |1 +
starmath/source/view.cxx|4
sw/source/ui/inc/pview.hxx |3 ++-
sw/source/ui/inc/view.hxx |5 +++--
sw/source/ui/uiview/pview.cxx |5 +
sw/source/ui/uiview/viewprt.cxx |5 +
14 files changed, 41 insertions(+), 23 deletions(-)
New commits:
commit d1660f19d5c8c60d8549b594a36d13a5edcf15a3
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 6 21:05:57 2012 +
an app can have print options without a print options dialog
e.g. draw and impress have print options, but no print options dialog
(It's plausible that we should merge the print options in the print dialog
with
the print options in the options... dialog of the printer settings dialog)
Change-Id: I25c029ad8ba482b1e8d8d5974cc8de99584b9a55
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 60d0872..7530478 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -110,7 +110,8 @@ public:
virtual void Notify( SfxBroadcaster rBC, const SfxHint rHint );
virtual SfxPrinter* GetPrinter( sal_Bool bCreate = false );
-virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter,
sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16
nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+virtual boolHasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const
SfxItemSet rOptions );
voidAddAccessibilityObject( SfxListener rObject );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 54606fa..d1e53ad 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -353,6 +353,7 @@ public:
virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter,
sal_uInt16 nDiffFlags =
SFX_PRINTER_ALL, bool bIsApi=false );
+virtual boolHasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const
SfxItemSet rOptions );
voidConnectObject( SdrOle2Obj* pObj );
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 505544e..37e0e86 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -570,6 +570,11 @@ sal_uInt16 ScPreviewShell::SetPrinter( SfxPrinter
*pNewPrinter, sal_uInt16 nDiff
return pDocShell-SetPrinter( pNewPrinter, nDiffFlags );
}
+bool ScPreviewShell::HasPrintOptionsPage() const
+{
+return true;
+}
+
SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const
SfxItemSet rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 799f953..d154b01 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1093,6 +1093,11 @@ sal_uInt16 ScTabViewShell::SetPrinter( SfxPrinter
*pNewPrinter, sal_uInt16 nDiff
return GetViewData()-GetDocShell()-SetPrinter( pNewPrinter, nDiffFlags );
}
+bool ScTabViewShell::HasPrintOptionsPage() const
+{
+return true;
+}
+
SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const
SfxItemSet rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
diff --git a/sd/source/ui/inc/ViewShellBase.hxx
b/sd/source/ui/inc/ViewShellBase.hxx
index 9377c83..458896a 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -139,11 +139,6 @@ public:
SfxPrinter* pNewPrinter,
sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false);
-/// Forwarded to the print manager.
-virtual SfxTabPage* CreatePrintOptionsPage (
-::Window *pParent,
-const SfxItemSet rOptions);
-
/// Forward methods to main sub shell.
virtual void WriteUserDataSequence (
::com::sun::star::uno::Sequence
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index d732280..0cd5c67 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -626,18 +626,6 @@ sal_uInt16 ViewShellBase::SetPrinter (
-SfxTabPage* ViewShellBase::CreatePrintOptionsPage(
-::Window *pParent,
-const SfxItemSet rOptions)
-{
-(void)pParent;
-(void)rOptions;
-return NULL;
-}
-
-
-
-
void
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/drivers/odbcbase/OResultSet.cxx | 12 ++--
connectivity/source/inc/odbc/OResultSet.hxx |6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit e37ab9f9eaaa77949e49535ffe0bc13723801dac
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Dec 7 10:32:58 2012 +0100
no SAL_CALL for internal utility functions
Change-Id: I7b945946d5e45d5518ab48fc8fe6cd66fba8d040
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index ddad30f..da69815 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -462,7 +462,7 @@ template typename T T OResultSet::impl_getValue( const
sal_Int32 _nColumnInd
}
// -
// this function exists for the implicit conversion to sal_Bool (compared to a
direct call to impl_getValue)
-sal_Bool SAL_CALL OResultSet::impl_getBoolean( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+sal_Bool OResultSet::impl_getBoolean( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
return impl_getValuesal_Int8(columnIndex, SQL_C_BIT);
}
@@ -510,7 +510,7 @@ Sequence sal_Int8 SAL_CALL OResultSet::getBytes(
sal_Int32 columnIndex ) thro
}
return nRet;
}
-Sequence sal_Int8 SAL_CALL OResultSet::impl_getBytes( sal_Int32 columnIndex
) throw(SQLException, RuntimeException)
+Sequence sal_Int8 OResultSet::impl_getBytes( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
@@ -531,7 +531,7 @@ Sequence sal_Int8 SAL_CALL OResultSet::impl_getBytes(
sal_Int32 columnIndex )
}
}
// -
-Date SAL_CALL OResultSet::impl_getDate( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException,
RuntimeException)
{
DATE_STRUCT aDate = impl_getValue DATE_STRUCT ( columnIndex,
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_DATE :
SQL_C_TYPE_DATE );
@@ -570,7 +570,7 @@ sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32
columnIndex ) throw(SQLExcepti
{
return getValuesal_Int64( columnIndex );
}
-sal_Int64 SAL_CALL OResultSet::impl_getLong( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
try
{
@@ -646,7 +646,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex,
const Reference ::co
return getValuertl::OUString( columnIndex );
}
// -
-Time SAL_CALL OResultSet::impl_getTime( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException,
RuntimeException)
{
TIME_STRUCT aTime = impl_getValue TIME_STRUCT ( columnIndex,
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_TIME :
SQL_C_TYPE_TIME );
@@ -658,7 +658,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex )
throw(SQLException, R
return getValueTime( columnIndex );
}
// -
-DateTime SAL_CALL OResultSet::impl_getTimestamp( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
TIMESTAMP_STRUCT aTime = impl_getValue TIMESTAMP_STRUCT ( columnIndex,
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_TIMESTAMP :
SQL_C_TYPE_TIMESTAMP );
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx
b/connectivity/source/inc/odbc/OResultSet.hxx
index c6ef45b..5d7a06c 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -187,9 +187,9 @@ namespace connectivity
::com::sun::star::util::Date impl_getDate( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
::com::sun::star::util::Time impl_getTime( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
::com::sun::star::util::DateTime impl_getTimestamp( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
-sal_Int64 SAL_CALL impl_getLong( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
-
Re: static clang source code analysis (Code Review Requested)
Hi, For the lcov reports, I put the following in the wiki: http://wiki.documentfoundation.org/Development/Lcov Feel free to try it out and edit it as you see fit. Regards, John Smith. On Wed, Dec 5, 2012 at 5:33 PM, Miklos Vajna vmik...@suse.cz wrote: On Wed, Dec 05, 2012 at 04:15:45PM +0100, John Smith lbalba...@gmail.com wrote: Sure, I can put short tutorials for generating both reports on the wiki. How do I get a wiki account, and where on the wiki should I put them ? Creating a wiki account: https://wiki.documentfoundation.org/index.php?title=Special:UserLogintype=signup I would create a page called http://wiki.documentfoundation.org/Development/Something, and link it from the Development page. Alternatively, just create two scripts that do the clang analysis / lcov report, and add it to git: http://wiki.documentfoundation.org/Development#Preparing_patches Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/odbcbase/OResultSet.cxx | 12 ++--
connectivity/source/inc/odbc/OResultSet.hxx | 16
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit d497d70a9bec0d174696177d93c141387cd0dbd0
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Dec 7 10:32:58 2012 +0100
no SAL_CALL for internal utility functions
Change-Id: I7b945946d5e45d5518ab48fc8fe6cd66fba8d040
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index ddad30f..da69815 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -462,7 +462,7 @@ template typename T T OResultSet::impl_getValue( const
sal_Int32 _nColumnInd
}
// -
// this function exists for the implicit conversion to sal_Bool (compared to a
direct call to impl_getValue)
-sal_Bool SAL_CALL OResultSet::impl_getBoolean( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+sal_Bool OResultSet::impl_getBoolean( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
return impl_getValuesal_Int8(columnIndex, SQL_C_BIT);
}
@@ -510,7 +510,7 @@ Sequence sal_Int8 SAL_CALL OResultSet::getBytes(
sal_Int32 columnIndex ) thro
}
return nRet;
}
-Sequence sal_Int8 SAL_CALL OResultSet::impl_getBytes( sal_Int32 columnIndex
) throw(SQLException, RuntimeException)
+Sequence sal_Int8 OResultSet::impl_getBytes( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
@@ -531,7 +531,7 @@ Sequence sal_Int8 SAL_CALL OResultSet::impl_getBytes(
sal_Int32 columnIndex )
}
}
// -
-Date SAL_CALL OResultSet::impl_getDate( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException,
RuntimeException)
{
DATE_STRUCT aDate = impl_getValue DATE_STRUCT ( columnIndex,
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_DATE :
SQL_C_TYPE_DATE );
@@ -570,7 +570,7 @@ sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32
columnIndex ) throw(SQLExcepti
{
return getValuesal_Int64( columnIndex );
}
-sal_Int64 SAL_CALL OResultSet::impl_getLong( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
try
{
@@ -646,7 +646,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex,
const Reference ::co
return getValuertl::OUString( columnIndex );
}
// -
-Time SAL_CALL OResultSet::impl_getTime( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException,
RuntimeException)
{
TIME_STRUCT aTime = impl_getValue TIME_STRUCT ( columnIndex,
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_TIME :
SQL_C_TYPE_TIME );
@@ -658,7 +658,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex )
throw(SQLException, R
return getValueTime( columnIndex );
}
// -
-DateTime SAL_CALL OResultSet::impl_getTimestamp( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
TIMESTAMP_STRUCT aTime = impl_getValue TIMESTAMP_STRUCT ( columnIndex,
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_TIMESTAMP :
SQL_C_TYPE_TIMESTAMP );
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx
b/connectivity/source/inc/odbc/OResultSet.hxx
index db2e94a..5d7a06c 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -182,14 +182,14 @@ namespace connectivity
// for simple cases
template typename T T impl_getValue( const sal_Int32
_nColumnIndex, SQLSMALLINT nType );
// these cases need some special treatment
-sal_Bool SAL_CALL impl_getBoolean( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence sal_Int8 SAL_CALL
impl_getBytes( sal_Int32 columnIndex )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
-::com::sun::star::util::Date SAL_CALL impl_getDate( sal_Int32
columnIndex ) throw(::com::sun::star::sdbc::SQLException,
minutes of ESC call ...
* Present: + Norbert, Ahmad, Eike, Stephan, Joel, Astron, Michael S, Fridrich, Kendy, Caolan, Tibby, Lionel, Michael M * Action Items + get binary signing key to Caolan (Fridrich/Thorsten) + upgrade Win32 build baseline to VS 2010 - as per tinderboxes (Fridrich) * Pending Action Items + add completed technical 4.0 changes to features wiki page (Michael) [ in progress ] + create a new AmbitiousHacks wiki page, based on GSOC page (Michael M) + minimal triage for good mentors for proposed easy hacks (Bjoern) + grok the list of contributors for suitable certified hackers (Kendy) + work on mail to encourage them to get certified (Kendy/Stephan/Bjoern) + pending list of people to poke. + disable Rhino / Beanshell unless in experimental mode (Michael) + check stlport situation with DudenCorrector (Thorsten) + tweak the configure defaults (Kendy) + no submodules by default, no gnome-vfs + come up with a proposal for UNO breakage / ns timestamps (Stephan, Michael S, Lionel) + persuade Thorsten of final MSI / pkg naming / resting place (Kendy) * UX input (Astron) + still working on the color picker + template manager design concerns (Cedric) + working to get it out of experimental mode + testing feedback, concerns about consistency around double-click vs. click + ongoing discussion. + testing of android/remote-presenter appreciated * Release Engineering update (Petr) + 4.0 timeline: feature-freeze status + Beta1 tag, Linux, Mac-Intel built, Win/Mac-PPC building + smoke-testing looks promising. + thanks to everyone that worked on it. + perhaps the easiest Beta1 yet. + 1350 commits in the last two weeks since Alpha 1. + any pending features that missed the freeze ? + they need to be in Beta2 + commit of fixes without review expected until RC1 + Personas need a few more days some UX review (Kendy) + features submitted to list / gerrit / without commit access before the freeze should still be merged ... + calc sort dialog change - got into 4.0 + Lionel's base performance work being tested in his private branch for merge; nails some MAB's + please don't forget to cherry-pick fixes from master - 4.0 + 3.6.4 retrospective + smooth release + good feedback from Rainer at least. + good to back-port MAB fixes from 4.0 to 3.6 as well + next release in January. AI: + setup LibreOffice 4.1 schedule in the wiki (Petr) + passing generic / Linux builds onto RedHat (Caolan) + 2nd VM setup - and all-lang configuration going well. + should finish tonight - mail the details. * Certification Committee update (Kendy/Stephan/Bjoern) + no action this week. * Features - please update: + http://wiki.documentfoundation.org/ReleaseNotes/4.0 + with screenshots / feature details ... * API cleanup - naming of new namespace (Kendy) + concerned about css:: going in - not an ideal namespace + for master - consider: what is the ideal outcome, how do we want to be seen from the outside ? + internally the code, engineer so we don't have to use any prefixes. + lang:: uno:: etc. + if we have new names/aliases - we get problems (Stephan) + differences internal vs. external are painful + open to dropping css:: for internal use + some compiler breakage without css:: (Norbert) + system names conflicts with 4.0.1 compiler bugs (?) + decision: drop ::com::sun::star:: for internal use on master * LGPL / mariadb mysql client library (Lionel) + identical C / client API: http://openquery.com/blog/mariadb-client-libraries-end-duallicensing + need a compatible C++ API / wrapper for existing code to work or mysql connector needs re-writing + that wrapper is useful - bringing us to a JDBC interface + volunteer(s) to help out here appreciated. * 4.0 completed tasks: + binfilter - removed completely (Norbert) + removes legacy StarOffice 1.0-5.0 binary filters + leaves .sxw .sxi etc. zip formats + dropped migrationAnalysis (Norbert) + obsolete, not-built, code removed now + not removing Lotus Word Pro filter + no good technical reasons to. + should we switch to native gtk+/print for 4.0 ? + no: not
[Libreoffice-commits] .: 3 commits - sc/qa sw/source
sc/qa/extras/macros-test.cxx |3 +--
sw/source/ui/dbui/dbinsdlg.cxx|4 ++--
sw/source/ui/inc/swtablerep.hxx |3 +--
sw/source/ui/shells/tabsh.cxx |2 +-
sw/source/ui/table/swtablerep.cxx |3 +--
sw/source/ui/uno/unomod.cxx |9 +++--
6 files changed, 9 insertions(+), 15 deletions(-)
New commits:
commit 95af0a93c18aca545c40f9bda5e48bf60f61b3c8
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 11:22:28 2012 +0100
-Werror,-Wunused-result
Change-Id: I91633af096dd82960867f3ef6eb962b7b20c3960
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index c5aa5a2..4d63089 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -141,8 +141,7 @@ void ScMacrosTest::testVba()
rtl::OUString aFileName;
createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
-rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM(Failed to load ) );
-sMsg.concat( aFileName );
+rtl::OUString sMsg( Failed to load + aFileName );
CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg,
RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
String sUrl = testInfo[i].sMacroUrl;
commit 6a31768bd5dc4637f4a62b568c38a8277f6ed3bc
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 10:02:51 2012 +0100
-Werror,-Wtautological-constant-out-of-range-compare
Change-Id: Ia9d77ea28c714a9bf3fc3a6c9ed832c9c4619089
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index caee7c5..9133400 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -693,7 +693,7 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo rInfo, c
sal_Int16 nZoom = 0;
if(!(rValue = nZoom))
throw IllegalArgumentException();
-SvxZoomType eZoom = (SvxZoomType)USHRT_MAX;
+SvxZoomType eZoom;
switch (nZoom)
{
case view::DocumentZoomType::OPTIMAL:
@@ -716,11 +716,8 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo rInfo, c
::rtl::OUString( SwXViewSettings: invalid zoom
type), 0, 0);
break;
}
-if(eZoom USHRT_MAX)
-{
-mpViewOption-SetZoomType( eZoom );
-mbApplyZoom = sal_True;
-}
+mpViewOption-SetZoomType( eZoom );
+mbApplyZoom = sal_True;
}
break;
case HANDLE_VIEWSET_ONLINE_LAYOUT :
commit 01872509d4d46e9e86d4371c9ef2034ab4b43fe4
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 09:59:24 2012 +0100
-Werror,-Wunused-private-field
Change-Id: I4a37e6aacbcce18f17e4b2eebecf43c0b1679f62
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 617da5a..3797e7b 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -710,7 +710,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*,
pButton )
SwTabCols aTabCols;
aTabCols.SetRight( nWidth );
aTabCols.SetRightMax( nWidth );
-pRep = new SwTableRep( aTabCols, sal_False );
+pRep = new SwTableRep( aTabCols );
pRep-SetAlign( text::HoriOrientation::NONE );
pRep-SetSpace( nWidth );
pRep-SetWidth( nWidth );
@@ -736,7 +736,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*,
pButton )
aTabCols.Insert( nW, sal_False, n );
}
delete pRep;
-pRep = new SwTableRep( aTabCols, sal_False );
+pRep = new SwTableRep( aTabCols );
pRep-SetAlign( text::HoriOrientation::NONE );
pRep-SetSpace( nWidth );
pRep-SetWidth( nWidth );
diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx
index 996d0b2..6efa1ed 100644
--- a/sw/source/ui/inc/swtablerep.hxx
+++ b/sw/source/ui/inc/swtablerep.hxx
@@ -38,13 +38,12 @@ class SW_DLLPUBLIC SwTableRep
sal_uInt16 nColCount;
sal_uInt16 nAllCols;
sal_uInt16 nWidthPercent;
-boolbComplex : 1;
sal_BoolbLineSelected : 1;
sal_BoolbWidthChanged : 1;
sal_BoolbColsChanged : 1;
public:
-SwTableRep( const SwTabCols rTabCol, bool bComplex );
+SwTableRep( const SwTabCols rTabCol );
~SwTableRep();
sal_BoolFillTabCols( SwTabCols rTabCol ) const;
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index db27f1d..ff1e401 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -214,7 +214,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet
rSet, SwWrtShell rSh )
// Pointer wird nach der Dialogausfuehrung geloescht
-SwTableRep* pRep = new
[Libreoffice-commits] .: 3 commits - salhelper/inc stoc/source
salhelper/inc/salhelper/dynload.hxx |8
stoc/source/defaultregistry/defaultregistry.cxx | 147 ---
stoc/source/implementationregistration/implreg.cxx |3
stoc/source/inspect/introspection.cxx|4
stoc/source/javavm/jvmargs.cxx | 15 -
stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx |3
6 files changed, 93 insertions(+), 87 deletions(-)
New commits:
commit 14acb6b69800c0850157c2ba15b50c5527e46939
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 11:38:05 2012 +0100
Unused variables
Change-Id: I8d0d72ac2c3d7f0b0576980c770cb62af983d074
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index fa3867d..2de4c88 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1657,7 +1657,6 @@ Sequence OUString
ImplementationRegistration::getImplementations(
const OUString locationUrl)
throw ( RuntimeException )
{
-OUString implLoaderUrl(implementationLoaderUrl);
OUString activatorName;
if (!implementationLoaderUrl.isEmpty())
@@ -1668,7 +1667,7 @@ Sequence OUString
ImplementationRegistration::getImplementations(
} else
{
// check locationUrl to find out what kind of loader is needed
-// set implLoaderUrl
+// set implementationLoaderUrl
}
if( m_xSMgr.is() ) {
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index b8d73d4..5956088 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -356,10 +356,6 @@ sal_Int32 IntrospectionAccessStatic_Impl::getMethodIndex(
const ::rtl::OUString
for( int i = 0 ; i nLen ; ++i )
{
const ReferenceXIdlMethod xMethod2 = pMethods[ i
];
-
-::rtl::OUString aTestClassName =
xMethod2-getDeclaringClass()-getName();
-::rtl::OUString aTestMethodName =
xMethod2-getName();
-
if( xMethod2-getName() == aPureMethodName )
{
Reference XIdlClass xMethClass2 =
xMethod2-getDeclaringClass();
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 31808a6..7497fcb 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -21,8 +21,6 @@
#include jvmargs.hxx
#include rtl/ustring.hxx
-
-using ::rtl::OUString;
namespace stoc_javavm {
JVM::JVM() throw()//: _enabled(sal_False)
@@ -31,20 +29,9 @@ JVM::JVM() throw()//: _enabled(sal_False)
void JVM::pushProp(const OUString property)
{
-sal_Int32 index = property.indexOf((sal_Unicode)'=');
-if(index 0)
-{
-OUString left = property.copy(0, index).trim();
-OUString right(property.copy(index + 1).trim());
-_props.push_back(property);
-}
-else
-{ // no '=', could be -X
-_props.push_back(property);
-}
+_props.push_back(property);
}
-
const ::std::vector ::rtl::OUString JVM::getProperties() const
{
return _props;
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
index 20e08ae..50be0cb 100644
--- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
+++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx
@@ -128,9 +128,6 @@ TypeDescriptionEnumerationImpl::createInstance(
aBytes.getConstArray(), aBytes.getLength(), false,
TYPEREG_VERSION_1);
-rtl::OUString aName(
-aReader.getTypeName().replace( '/', '.' ) );
-
if ( aReader.getTypeClass() == RT_TYPE_MODULE )
{
// Do not close xKey!
commit 98108afb23f04d46c81b8b7d97fc2c71f57207a8
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 11:31:51 2012 +0100
Proper indentation
Change-Id: I9fe211563c8b2b2718be25180294421af5593886
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx
b/stoc/source/defaultregistry/defaultregistry.cxx
index 149593f..b6534fb 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -185,8 +185,8 @@ NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl*
pDefaultRegistry,
if (m_localKey.is())
{
m_name = m_localKey-getKeyName();
-} else
-if (m_defaultKey.is())
+}
+else if (m_defaultKey.is())
{
m_name = m_defaultKey-getKeyName();
}
@@ -213,8 +213,8 @@ NestedKeyImpl::NestedKeyImpl( const OUString rKeyName,
if (m_localKey.is())
{
m_name = m_localKey-getKeyName();
Re: loader.loadComponentFromURL works slow when we are restoring CALC sheet from byte array | loader.loadComponentFromURL
On Thu, 2012-12-06 at 09:19 -0500, William Beltrán wrote: Ok. Thanks :-) self._context.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop, self._context) inputStream = self.serviceManager.createInstanceWithContext(com.sun.star.io.SequenceInputStream, self.localContext) inputStream.initialize((uno.ByteSequence(data),)) Looks like you convert some huge string into a byte sequence. I guess, that should be reasonably quick. What does your huge string contain ? zipped ODF ? flat-ODF ? what ? Is the contain of the file (bytesequence), just like another odf file that really is a zip file as you knows. It'd be good to know what is in that sequence :-) is it zipped ODF data, flat ODF ? etc. If I open the file in LibreOffice and saves it as xls file that is very fast. Sounds very odd; if this is a linux machine - can you run a sampling profiler like oprofile to work out what is happening there - almost certainly something very dumb is going on - we should be able to stream data from a python bytesequence at great speed: it should be ~all native code from there on in IMHO - so something very odd going on :-) perhaps some unusual filter / type detection stuff (?). Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: qadevOOo/tests
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 14
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 16383552c8477ac4620d6260a2b7981a9a6aaf17
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 12:14:11 2012 +0100
Use XSynchronousDispatch to avoid races
Change-Id: I517ae0f3a17e769da20219d69d7ff4bac44623cd
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index e1b5019..d58e374 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -37,9 +37,9 @@ import com.sun.star.accessibility.XAccessibleStateSet;
import com.sun.star.awt.XWindow;
import com.sun.star.container.XIndexAccess;
import com.sun.star.frame.XController;
-import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XModel;
+import com.sun.star.frame.XSynchronousDispatch;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
@@ -124,18 +124,15 @@ public class ScAccessiblePageHeaderArea extends TestCase {
aParseURL[0].Complete = .uno:PrintPreview;
xParser.parseStrict(aParseURL);
URL aURL = aParseURL[0];
-XDispatch xDispatcher = xDispProv.queryDispatch(aURL, , 0);
-if(xDispatcher != null)
-xDispatcher.dispatch( aURL, null );
+XSynchronousDispatch xDispatcher = UnoRuntime.queryInterface(
+XSynchronousDispatch.class,
+xDispProv.queryDispatch(aURL, , 0));
+xDispatcher.dispatch( aURL, null );
} catch (com.sun.star.uno.Exception e) {
log.println(Couldn't change mode);
throw new StatusException(Status.failed(Couldn't change mode));
}
-try {
-Thread.sleep(500);
-} catch (InterruptedException ex) {}
-
AccessibilityTools at = new AccessibilityTools();
XWindow xWindow = at.getCurrentContainerWindow( (XMultiServiceFactory)
Param.getMSF(), aModel);
@@ -213,4 +210,4 @@ public class ScAccessiblePageHeaderArea extends TestCase {
throw new StatusException( Couldn't create document , e );
}
}
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Is fdo#51638 fixed with I6a4c7024da154104d985bca25b26a8243174ec8d ?
On Mon, 2012-12-03 at 14:17 -0200, Olivier Hallot wrote: Hi Stephan My bad indeed. https://bugs.freedesktop.org/show_bug.cgi?id=51638 Hmm, I don't *think* my fix is applicable to 3.6.X where the bug was initially reported. On the other hand Stephan seems to have fixed this for 4-0 so I've proposed a backport to 3-6 of that for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#51638 In unopkg gui dispose component contex...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1263 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/1263/1 Resolves: fdo#51638 In unopkg gui dispose component context from DeInitVCL ...the same way it is done in soffice.bin. framework's Desktop::dispose() requires the solar mutex to be still alive, which is destroyed in DeInitVCL, so if the component context/service manager is only disposed afterwards, the solar mutex is already gone. This required moving disposeBridges() around, but it allowed to get rid of DisposeGuard. (cherry picked from commit 37cc83e594fa8ca131fc5fb98506287b7daedffd) Conflicts: desktop/source/pkgchk/unopkg/unopkg_app.cxx desktop/source/pkgchk/unopkg/unopkg_shared.h Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b --- M desktop/source/deployment/gui/dp_gui_service.cxx M desktop/source/deployment/inc/dp_misc.h M desktop/source/deployment/misc/dp_misc.cxx M desktop/source/pkgchk/unopkg/unopkg_app.cxx M desktop/source/pkgchk/unopkg/unopkg_misc.cxx M desktop/source/pkgchk/unopkg/unopkg_shared.h 6 files changed, 57 insertions(+), 81 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1263 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/doctemplates.cxx |5 ++---
sfx2/source/doc/guisaveas.cxx|2 +-
sfx2/source/doc/objcont.cxx |2 +-
sfx2/source/doc/objstor.cxx |3 ---
4 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 6a7371d266b7050a9c07b3abce84ef23904525ac
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 7 09:47:37 2012 +
loplugin: various unused variables
Change-Id: I59cfea1b755fb4da5cdc9032e719e4e1579a906e
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 1313fee..49e71cd 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -444,7 +444,7 @@ void SfxDocTplService_Impl::init_Impl()
m_xDocProps.set(document::DocumentProperties::create(
::comphelper::getProcessComponentContext()));
} catch (uno::RuntimeException const e) {
-SAL_WARN(sfx.doc, SfxDocTplService_Impl::init_Impl:
+SAL_WARN(sfx2.doc, SfxDocTplService_Impl::init_Impl:
cannot create DocumentProperties service: e.Message);
}
@@ -1903,7 +1903,6 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const
OUString rGroupName,
aStoreArgs[1].Name = ::rtl::OUString(DocumentTitle);
aStoreArgs[1].Value = rTemplateName;
-::rtl::OUString aCurrentDocumentURL = rStorable-getLocation();
if( !::utl::UCBContentHelper::EqualURLs( aNewTemplateTargetURL,
rStorable-getLocation() ))
rStorable-storeToURL( aNewTemplateTargetURL, aStoreArgs );
else
@@ -1987,7 +1986,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const
OUString rGroupName,
}
// Get the content type
-OUString aTitle, aType, aTargetURL2, aFullName;
+OUString aTitle, aType, aTargetURL2;
sal_Bool bDocHasTitle = sal_False;
if( !getTitleFromURL( rSourceURL, aTitle, aType, bDocHasTitle ) )
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index c6af316..6c5f2e2 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1734,7 +1734,7 @@ void SfxStoringHelper::SetDocInfoState(
}
catch (const uno::Exception e)
{
-SAL_INFO(sfx.doc, SetDocInfoState: caught exception:
e.Message);
+SAL_INFO(sfx2.doc, SetDocInfoState: caught exception:
e.Message);
}
// set the modified flag back if required
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index c532a31..118851e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -907,7 +907,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( )
}
catch (const Exception e)
{
-SAL_INFO(sfx.doc, caught exception e.Message);
+SAL_INFO(sfx2.doc, caught exception e.Message);
}
// if modify date was read successfully
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 88380bb..887be25 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1469,7 +1469,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
aInfo.Comment = pVersionItem-GetValue();
// version author
-String aAuthor;
if ( pAuthorItem )
aInfo.Author = pAuthorItem-GetValue();
else
@@ -2133,7 +2132,6 @@ sal_Bool SfxObjectShell::ConvertFrom
sal_Bool SfxObjectShell::ImportFrom( SfxMedium rMedium, bool bInsert )
{
-::rtl::OUString aTypeName( rMedium.GetFilter()-GetTypeName() );
::rtl::OUString aFilterName( rMedium.GetFilter()-GetFilterName() );
uno::Reference lang::XMultiServiceFactory xMan =
::comphelper::getProcessServiceFactory();
@@ -2244,7 +2242,6 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium rMedium,
bool bInsert )
sal_Bool SfxObjectShell::ExportTo( SfxMedium rMedium )
{
-::rtl::OUString aTypeName( rMedium.GetFilter()-GetTypeName() );
::rtl::OUString aFilterName( rMedium.GetFilter()-GetFilterName() );
uno::Reference document::XExporter xExporter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: qadevOOo/tests
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 15 +++-
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit d23508eebba52d7e40c84b3cea17868192519654
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 12:34:28 2012 +0100
Revert Use XSynchronousDispatch to avoid races
This reverts commit 16383552c8477ac4620d6260a2b7981a9a6aaf17, which was
broken,
but toplevel make .../workdir/*/JunitTest/sc_unoapi/done did not trigger
qadevOOo rebuild, so got unnoticed at first.
Change-Id: I6031cf9f67a8cc69cbabd197bd01462968eeb07e
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index d58e374..e1b5019 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -37,9 +37,9 @@ import com.sun.star.accessibility.XAccessibleStateSet;
import com.sun.star.awt.XWindow;
import com.sun.star.container.XIndexAccess;
import com.sun.star.frame.XController;
+import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
import com.sun.star.frame.XModel;
-import com.sun.star.frame.XSynchronousDispatch;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
@@ -124,15 +124,18 @@ public class ScAccessiblePageHeaderArea extends TestCase {
aParseURL[0].Complete = .uno:PrintPreview;
xParser.parseStrict(aParseURL);
URL aURL = aParseURL[0];
-XSynchronousDispatch xDispatcher = UnoRuntime.queryInterface(
-XSynchronousDispatch.class,
-xDispProv.queryDispatch(aURL, , 0));
-xDispatcher.dispatch( aURL, null );
+XDispatch xDispatcher = xDispProv.queryDispatch(aURL, , 0);
+if(xDispatcher != null)
+xDispatcher.dispatch( aURL, null );
} catch (com.sun.star.uno.Exception e) {
log.println(Couldn't change mode);
throw new StatusException(Status.failed(Couldn't change mode));
}
+try {
+Thread.sleep(500);
+} catch (InterruptedException ex) {}
+
AccessibilityTools at = new AccessibilityTools();
XWindow xWindow = at.getCurrentContainerWindow( (XMultiServiceFactory)
Param.getMSF(), aModel);
@@ -210,4 +213,4 @@ public class ScAccessiblePageHeaderArea extends TestCase {
throw new StatusException( Couldn't create document , e );
}
}
-}
+}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/core/macros-test.cxx | 43 +
sw/source/core/unocore/unodraw.cxx |7 +-
2 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 7 12:23:21 2012 +0100
fdo#55289: fix crash in SwXShape::setPropertyValue:
In the libreoffice-3-6 branch the docx import crashes here when setting
the anchor position of a shape, because the previous setting of the
AnchorType was not done properly: the position of the anchor in the
SwFmt did not match the actual position of the text attribute, so we get
these assertions: Missing FlyInCnt-Hint. and crash.
This cannot be reproduced with the docx import on master, because on
master a different intermediate AnchorType is set, and transitioning
from that happens not to cause the crash. But it can be reproduced with
a unit test.
The regression was introduced in libreoffice-3-6 with
backport commit 10a0774b9da546557632cd09c4f6958f8939.
Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 7d71977..bdd7dee 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -37,8 +37,15 @@
#include com/sun/star/frame/XDesktop.hpp
#include com/sun/star/lang/XComponent.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/frame/XComponentLoader.hpp
#include com/sun/star/document/MacroExecMode.hpp
+#include com/sun/star/drawing/XDrawPageSupplier.hpp
+#include com/sun/star/drawing/XShapes.hpp
+#include com/sun/star/drawing/XShape.hpp
+#include com/sun/star/text/XTextDocument.hpp
+#include com/sun/star/text/TextContentAnchorType.hpp
#include sfx2/app.hxx
#include sfx2/docfilt.hxx
@@ -48,6 +55,7 @@
#include basic/sbxdef.hxx
+#include doc.hxx
#include docsh.hxx
SV_DECL_REF(SwDocShell)
@@ -73,6 +81,7 @@ public:
//void testStarBasic();
void testVba();
+void testFdo55289();
CPPUNIT_TEST_SUITE(SwMacrosTest);
#if !defined(MACOSX) !defined(WNT)
//enable this test if you want to play with star basic macros in unit tests
@@ -80,6 +89,7 @@ public:
//CPPUNIT_TEST(testStarBasic);
CPPUNIT_TEST(testVba);
#endif
+CPPUNIT_TEST(testFdo55289);
CPPUNIT_TEST_SUITE_END();
@@ -162,6 +172,39 @@ void SwMacrosTest::testVba()
}
}
+void SwMacrosTest::testFdo55289()
+{
+SwDoc *const pDoc = new SwDoc;
+SwDocShellRef pDocShell = new SwDocShell(pDoc, SFX_CREATE_MODE_EMBEDDED);
+// this needs to run with no layout to tickle the bugs in the special
+// cases in SwXShape re-anchoring
+assert(!pDoc-GetCurrentLayout());
+
+uno::Referenceframe::XModel const xModel(pDocShell-GetModel());
+uno::Referencedrawing::XDrawPageSupplier const xDPS(xModel, UNO_QUERY);
+uno::Referencedrawing::XShapes const xShapes(xDPS-getDrawPage(),
+UNO_QUERY);
+uno::Referencebeans::XPropertySet const xShape(
+uno::Referencelang::XMultiServiceFactory(xModel, UNO_QUERY)-
+createInstance(com.sun.star.drawing.GraphicObjectShape),
+UNO_QUERY);
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_PAGE));
+xShapes-add(uno::Referencedrawing::XShape(xShape, UNO_QUERY));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AS_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AS_CHARACTER));
+uno::Referencetext::XTextRange const xEnd =
+uno::Referencetext::XTextDocument(xModel,
UNO_QUERY)-getText()-getEnd();
+uno::Referencetext::XTextContent const xShapeContent(xShape, UNO_QUERY);
+xShapeContent-attach(xEnd);
+}
+
SwMacrosTest::SwMacrosTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sw/qa/core/data))
{
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 8193b08..62b6bc5 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1355,7 +1355,12 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
SwFmtFlyCnt aFmt( pFlyFmt );
pNd-InsertItem(aFmt,
aPam.GetPoint()-nContent.GetIndex(), 0 );
-//aPam.GetPoint()-nContent--;
+aPam.GetPoint()-nContent--; // InsertItem moved it
+SwFmtAnchor aNewAnchor(
+dynamic_castconst SwFmtAnchor(
+
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sw/source
sw/source/core/unocore/unodraw.cxx | 47 ++---
1 file changed, 29 insertions(+), 18 deletions(-)
New commits:
commit 0b6b550aafe320e81bc48abff0f84ba59e0b3ecf
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jun 6 20:29:57 2012 +0200
handle properly anchor transition at page-at paragraph-as character
Otherwise setting text range afterwards crashes with pHnt being NULL.
Change-Id: Ib4ac2712c061605dcaaa262280c0307f7a9af2ce
(cherry picked from commit 5de61f7a4ddb502730454e4bf3232f7f4b4175e1)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 329bed9..267f6f2 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1344,18 +1344,29 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
aSet.Put( aNewAnchor );
pFmt-SetFmtAttr(aSet);
bSetAttr = false;
-if( text::TextContentAnchorType_AS_CHARACTER ==
eNewAnchor
-(FLY_AS_CHAR != eOldAnchorId))
+}
+if( text::TextContentAnchorType_AS_CHARACTER ==
eNewAnchor
+(FLY_AS_CHAR != eOldAnchorId))
+{
+SwPaM aPam(pDoc-GetNodes().GetEndOfContent());
+if( pDoc-GetCurrentLayout() )
{
-//the RES_TXTATR_FLYCNT needs to be added now
-SwTxtNode *pNd = aPam.GetNode()-GetTxtNode();
-SAL_WARN_IF( !pNd, sw.uno, Crsr is not in a
TxtNode. );
-SwFmtFlyCnt aFmt( pFlyFmt );
-pNd-InsertItem(aFmt,
-aPam.GetPoint()-nContent.GetIndex(), 0 );
-//aPam.GetPoint()-nContent--;
-
+SwCrsrMoveState aState( MV_SETONLYTEXT );
+Point aTmp( pObj-GetSnapRect().TopLeft() );
+pDoc-GetCurrentLayout()-GetCrsrOfst(
aPam.GetPoint(), aTmp, aState );
+}
+else
+{
+//without access to the layout the last node
of the body will be used as anchor position
+aPam.Move( fnMoveBackward, fnGoDoc );
}
+//the RES_TXTATR_FLYCNT needs to be added now
+SwTxtNode *pNd = aPam.GetNode()-GetTxtNode();
+SAL_WARN_IF( !pNd, sw.uno, Crsr is not in a
TxtNode. );
+SwFmtFlyCnt aFmt( pFlyFmt );
+pNd-InsertItem(aFmt,
+aPam.GetPoint()-nContent.GetIndex(), 0 );
+//aPam.GetPoint()-nContent--;
}
if( bSetAttr )
pFmt-SetFmtAttr(aSet);
commit d1c01080d76a7599b79eb6a4960064be86d75858
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jun 6 18:17:50 2012 +0200
fix incorrect OSL_ENSURE - SAL_WARN_IF conversion (condition not inverted)
Change-Id: I57dfa64c55e046ed51797b2abeb7ba3242e637da
(cherry picked from commit dfc4832049c140b7442c085062599aef1953e8fd)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 662a8ff..329bed9 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1174,7 +1174,7 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
else if(RES_OPAQUE == pEntry-nWID)
{
SvxShape* pSvxShape = GetSvxShape();
-SAL_WARN_IF(pSvxShape, sw.uno, No SvxShape found!);
+SAL_WARN_IF(!pSvxShape, sw.uno, No SvxShape found!);
if(pSvxShape)
{
SdrObject* pObj = pSvxShape-GetSdrObject();
@@ -1220,14 +1220,14 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
//To prevent this the connection between
format and attribute has to be broken before.
const SwPosition *pPos =
aAnchor.GetCntntAnchor();
SwTxtNode *pTxtNode =
pPos-nNode.GetNode().GetTxtNode();
-SAL_WARN_IF( pTxtNode-HasHints(), sw.uno,
Missing FlyInCnt-Hint. );
+SAL_WARN_IF( !pTxtNode-HasHints(), sw.uno,
Missing FlyInCnt-Hint. );
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/drawingml/chart/titlecontext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be9e8f6ee4a233b28cbe45cc3c3c01a4d9b9d8d7
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 7 13:03:37 2012 +0100
TextContext::onCharacters: missing rtl:: prefix
Change-Id: I8b9b135df739de99afcc79fdb4c56a93189db7b5
diff --git a/oox/source/drawingml/chart/titlecontext.cxx
b/oox/source/drawingml/chart/titlecontext.cxx
index 1fcb3cc..a368129 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -80,7 +80,7 @@ void TextContext::onCharacters( const OUString rChars )
if( isCurrentElement( C_TOKEN( v ) ) )
{
// Static text is stored as a single string formula token for Excel
document.
-OUStringBuffer aBuf;
+rtl::OUStringBuffer aBuf;
aBuf.append('').append(rChars).append('');
mrModel.mxDataSeq.create().maFormula = aBuf.makeStringAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#55289: fix crash in SwXShape::setPropertyValue:
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1264 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/1264/1 fdo#55289: fix crash in SwXShape::setPropertyValue: In the libreoffice-3-6 branch the docx import crashes here when setting the anchor position of a shape, because the previous setting of the AnchorType was not done properly: the position of the anchor in the SwFmt did not match the actual position of the text attribute, so we get these assertions: Missing FlyInCnt-Hint. and crash. This cannot be reproduced with the docx import on master, because on master a different intermediate AnchorType is set, and transitioning from that happens not to cause the crash. But it can be reproduced with a unit test. The regression was introduced in libreoffice-3-6 with backport commit 10a0774b9da546557632cd09c4f6958f8939. Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c (cherry picked from commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a) --- M sw/qa/core/macros-test.cxx M sw/source/core/unocore/unodraw.cxx 2 files changed, 49 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1264 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/qa sw/source
sw/qa/core/macros-test.cxx | 43 +
sw/source/core/unocore/unodraw.cxx |7 +-
2 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 42a5936eb060e1850508b7402ca9fc5a238d713a
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 7 12:23:21 2012 +0100
fdo#55289: fix crash in SwXShape::setPropertyValue:
In the libreoffice-3-6 branch the docx import crashes here when setting
the anchor position of a shape, because the previous setting of the
AnchorType was not done properly: the position of the anchor in the
SwFmt did not match the actual position of the text attribute, so we get
these assertions: Missing FlyInCnt-Hint. and crash.
This cannot be reproduced with the docx import on master, because on
master a different intermediate AnchorType is set, and transitioning
from that happens not to cause the crash. But it can be reproduced with
a unit test.
The regression was introduced in libreoffice-3-6 with
backport commit 10a0774b9da546557632cd09c4f6958f8939.
Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c
(cherry picked from commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a)
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 7d71977..bdd7dee 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -37,8 +37,15 @@
#include com/sun/star/frame/XDesktop.hpp
#include com/sun/star/lang/XComponent.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/frame/XComponentLoader.hpp
#include com/sun/star/document/MacroExecMode.hpp
+#include com/sun/star/drawing/XDrawPageSupplier.hpp
+#include com/sun/star/drawing/XShapes.hpp
+#include com/sun/star/drawing/XShape.hpp
+#include com/sun/star/text/XTextDocument.hpp
+#include com/sun/star/text/TextContentAnchorType.hpp
#include sfx2/app.hxx
#include sfx2/docfilt.hxx
@@ -48,6 +55,7 @@
#include basic/sbxdef.hxx
+#include doc.hxx
#include docsh.hxx
SV_DECL_REF(SwDocShell)
@@ -73,6 +81,7 @@ public:
//void testStarBasic();
void testVba();
+void testFdo55289();
CPPUNIT_TEST_SUITE(SwMacrosTest);
#if !defined(MACOSX) !defined(WNT)
//enable this test if you want to play with star basic macros in unit tests
@@ -80,6 +89,7 @@ public:
//CPPUNIT_TEST(testStarBasic);
CPPUNIT_TEST(testVba);
#endif
+CPPUNIT_TEST(testFdo55289);
CPPUNIT_TEST_SUITE_END();
@@ -162,6 +172,39 @@ void SwMacrosTest::testVba()
}
}
+void SwMacrosTest::testFdo55289()
+{
+SwDoc *const pDoc = new SwDoc;
+SwDocShellRef pDocShell = new SwDocShell(pDoc, SFX_CREATE_MODE_EMBEDDED);
+// this needs to run with no layout to tickle the bugs in the special
+// cases in SwXShape re-anchoring
+assert(!pDoc-GetCurrentLayout());
+
+uno::Referenceframe::XModel const xModel(pDocShell-GetModel());
+uno::Referencedrawing::XDrawPageSupplier const xDPS(xModel, UNO_QUERY);
+uno::Referencedrawing::XShapes const xShapes(xDPS-getDrawPage(),
+UNO_QUERY);
+uno::Referencebeans::XPropertySet const xShape(
+uno::Referencelang::XMultiServiceFactory(xModel, UNO_QUERY)-
+createInstance(com.sun.star.drawing.GraphicObjectShape),
+UNO_QUERY);
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_PAGE));
+xShapes-add(uno::Referencedrawing::XShape(xShape, UNO_QUERY));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AS_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AS_CHARACTER));
+uno::Referencetext::XTextRange const xEnd =
+uno::Referencetext::XTextDocument(xModel,
UNO_QUERY)-getText()-getEnd();
+uno::Referencetext::XTextContent const xShapeContent(xShape, UNO_QUERY);
+xShapeContent-attach(xEnd);
+}
+
SwMacrosTest::SwMacrosTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sw/qa/core/data))
{
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 8193b08..62b6bc5 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1355,7 +1355,12 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
SwFmtFlyCnt aFmt( pFlyFmt );
pNd-InsertItem(aFmt,
aPam.GetPoint()-nContent.GetIndex(), 0 );
-//aPam.GetPoint()-nContent--;
+aPam.GetPoint()-nContent--; // InsertItem moved it
+SwFmtAnchor aNewAnchor(
+
[Libreoffice-commits] .: sw/source
sw/source/ui/shells/txtattr.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit d4ca0036d723963b1874901f7185072a70789a99
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 7 12:52:43 2012 +
eEscape can never be FN_SET_SUPER_SCRIPT
orthogonal enum and slot id things
If it was supposed to be if(eEscape == SVX_ESCAPEMENT_SUPERSCRIPT) then
setting
superscript would instead sets subscript. Seeing as this is wrong since day 0
and the code should never goes into that branch I reckon its a forgotten
remnant from before superscript was implemented as it is now and its better
to
remove the code entirely
Change-Id: I73010cf9428c96dfc75033c138694c5781a73c50
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index a746419..6802fe5 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -123,11 +123,6 @@ void SwTextShell::ExecCharAttr(SfxRequest rReq)
aEscape.GetEsc() = DFLT_ESC_AUTO_SUPER;
else if(eEscape == SVX_ESCAPEMENT_SUBSCRIPT)
aEscape.GetEsc() = DFLT_ESC_AUTO_SUB;
-if(eState != STATE_OFF )
-{
-if(eEscape == FN_SET_SUPER_SCRIPT)
-aEscape.GetEsc() *= -1;
-}
rSh.SetAttr( aEscape );
rReq.AppendItem( aEscape );
rReq.Done();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/qa sw/source
sw/qa/core/macros-test.cxx | 43 +
sw/source/core/unocore/unodraw.cxx |7 +-
2 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 4273e1411fbcbad9159925ccadb2e78b3fa9c0e4
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 7 12:23:21 2012 +0100
fdo#55289: fix crash in SwXShape::setPropertyValue:
In the libreoffice-3-6 branch the docx import crashes here when setting
the anchor position of a shape, because the previous setting of the
AnchorType was not done properly: the position of the anchor in the
SwFmt did not match the actual position of the text attribute, so we get
these assertions: Missing FlyInCnt-Hint. and crash.
This cannot be reproduced with the docx import on master, because on
master a different intermediate AnchorType is set, and transitioning
from that happens not to cause the crash. But it can be reproduced with
a unit test.
The regression was introduced in libreoffice-3-6 with
backport commit 10a0774b9da546557632cd09c4f6958f8939.
Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c
(cherry picked from commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a)
Reviewed-on: https://gerrit.libreoffice.org/1264
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 3f9262e..cbabeaf 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -37,8 +37,15 @@
#include com/sun/star/frame/XDesktop.hpp
#include com/sun/star/lang/XComponent.hpp
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/frame/XComponentLoader.hpp
#include com/sun/star/document/MacroExecMode.hpp
+#include com/sun/star/drawing/XDrawPageSupplier.hpp
+#include com/sun/star/drawing/XShapes.hpp
+#include com/sun/star/drawing/XShape.hpp
+#include com/sun/star/text/XTextDocument.hpp
+#include com/sun/star/text/TextContentAnchorType.hpp
#include sfx2/app.hxx
#include sfx2/docfilt.hxx
@@ -48,6 +55,7 @@
#include basic/sbxdef.hxx
+#include doc.hxx
#include docsh.hxx
SO2_DECL_REF(SwDocShell)
@@ -73,6 +81,7 @@ public:
//void testStarBasic();
void testVba();
+void testFdo55289();
CPPUNIT_TEST_SUITE(SwMacrosTest);
#if !defined(MACOSX) !defined(WNT)
//enable this test if you want to play with star basic macros in unit tests
@@ -80,6 +89,7 @@ public:
//CPPUNIT_TEST(testStarBasic);
CPPUNIT_TEST(testVba);
#endif
+CPPUNIT_TEST(testFdo55289);
CPPUNIT_TEST_SUITE_END();
@@ -162,6 +172,39 @@ void SwMacrosTest::testVba()
}
}
+void SwMacrosTest::testFdo55289()
+{
+SwDoc *const pDoc = new SwDoc;
+SwDocShellRef pDocShell = new SwDocShell(pDoc, SFX_CREATE_MODE_EMBEDDED);
+// this needs to run with no layout to tickle the bugs in the special
+// cases in SwXShape re-anchoring
+assert(!pDoc-GetCurrentLayout());
+
+uno::Referenceframe::XModel const xModel(pDocShell-GetModel());
+uno::Referencedrawing::XDrawPageSupplier const xDPS(xModel, UNO_QUERY);
+uno::Referencedrawing::XShapes const xShapes(xDPS-getDrawPage(),
+UNO_QUERY);
+uno::Referencebeans::XPropertySet const xShape(
+uno::Referencelang::XMultiServiceFactory(xModel, UNO_QUERY)-
+createInstance(com.sun.star.drawing.GraphicObjectShape),
+UNO_QUERY);
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_PAGE));
+xShapes-add(uno::Referencedrawing::XShape(xShape, UNO_QUERY));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AS_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xShape-setPropertyValue(AnchorType,
+makeAny(text::TextContentAnchorType_AS_CHARACTER));
+uno::Referencetext::XTextRange const xEnd =
+uno::Referencetext::XTextDocument(xModel,
UNO_QUERY)-getText()-getEnd();
+uno::Referencetext::XTextContent const xShapeContent(xShape, UNO_QUERY);
+xShapeContent-attach(xEnd);
+}
+
SwMacrosTest::SwMacrosTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sw/qa/core/data))
{
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 267f6f2..769bf14 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1366,7 +1366,12 @@ void SwXShape::setPropertyValue(const rtl::OUString
rPropertyName, const uno::A
SwFmtFlyCnt aFmt( pFlyFmt );
pNd-InsertItem(aFmt,
aPam.GetPoint()-nContent.GetIndex(), 0 );
-
[PUSHED] Change in core[libreoffice-3-6]: fdo#55289: fix crash in SwXShape::setPropertyValue:
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1264 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1264 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/drawingml/diagram/constraintlistcontext.cxx|1
oox/source/drawingml/diagram/datamodelcontext.cxx |1
oox/source/drawingml/diagram/diagram.cxx | 29 ++---
oox/source/drawingml/diagram/diagram.hxx | 78 +++---
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx |1
oox/source/drawingml/diagram/diagramfragmenthandler.cxx |3
oox/source/drawingml/diagram/diagramfragmenthandler.hxx |4
oox/source/drawingml/diagram/diagramlayoutatoms.cxx |6 -
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 26 ++--
oox/source/drawingml/diagram/layoutnodecontext.cxx|1
10 files changed, 72 insertions(+), 78 deletions(-)
New commits:
commit a5e6a1faa36c72be6fcc16404f5daa4993d73bce
Author: José Guilherme Vanz guilherme@gmail.com
Date: Thu Dec 6 21:55:58 2012 -0200
::rtl:: removal in oox
This commit removes some ::rtl:: prefixes on oox
Change-Id: Ibb3be70695c48eb0a02fdf285a0c049e244d613e
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1259
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx
b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index f1e5076..8bc0e94 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx
@@ -23,7 +23,6 @@
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx
b/oox/source/drawingml/diagram/datamodelcontext.cxx
index 1dcee0d..2526be2 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -26,7 +26,6 @@
using namespace ::oox::core;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 29f28dc..0b7ab56 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -40,7 +40,6 @@
#include iostream
#include fstream
-using rtl::OUString;
using namespace ::com::sun::star;
namespace oox { namespace drawingml {
@@ -99,9 +98,9 @@ void Diagram::setLayout( const DiagramLayoutPtr pLayout)
}
#if OSL_DEBUG_LEVEL 1
-rtl::OString normalizeDotName( const rtl::OUString rStr )
+OString normalizeDotName( const OUString rStr )
{
-rtl::OUStringBuffer aBuf;
+OUStringBuffer aBuf;
aBuf.append((sal_Unicode)'N');
const sal_Int32 nLen(rStr.getLength());
@@ -113,12 +112,12 @@ rtl::OString normalizeDotName( const rtl::OUString rStr )
aBuf.append((sal_Unicode)aChar);
}
-return rtl::OUStringToOString(aBuf.makeStringAndClear(),
+return OUStringToOString(aBuf.makeStringAndClear(),
RTL_TEXTENCODING_UTF8);
}
#endif
-static sal_Int32 calcDepth( const rtl::OUString rNodeName,
+static sal_Int32 calcDepth( const OUString rNodeName,
const dgm::Connections rCnx )
{
// find length of longest path in 'isChild' graph, ending with rNodeName
@@ -166,12 +165,12 @@ void Diagram::build( )
if( !aCurrPoint-msPresentationLayoutName.isEmpty() )
output label=\
-rtl::OUStringToOString(
+OUStringToOString(
aCurrPoint-msPresentationLayoutName,
RTL_TEXTENCODING_UTF8).getStr() \, ;
else
output label=\
-rtl::OUStringToOString(
+OUStringToOString(
aCurrPoint-msModelId,
RTL_TEXTENCODING_UTF8).getStr() \, ;
@@ -200,7 +199,7 @@ void Diagram::build( )
textNode nCount
[
label=\
-rtl::OUStringToOString(
+OUStringToOString(
aCurrPoint-mpShape-getTextBody()-getParagraphs().front()-getRuns().front()-getText(),
RTL_TEXTENCODING_UTF8).getStr()
\ ]; std::endl;
@@ -249,7 +248,7 @@ void Diagram::build( )
[style=dotted,
((aCurrCxn-mnType == XML_presOf) ? color=red, :
((aCurrCxn-mnType == XML_presParOf) ? color=green, : ))
label=\
-rtl::OUStringToOString(aCurrCxn-msModelId,
+OUStringToOString(aCurrCxn-msModelId,
RTL_TEXTENCODING_UTF8
).getStr()
[Libreoffice-commits] .: oox/source
oox/source/drawingml/table/tablebackgroundstylecontext.cxx |1 -
oox/source/drawingml/table/tablecell.cxx | 11 +--
oox/source/drawingml/table/tablecellcontext.cxx |1 -
oox/source/drawingml/table/tablecontext.cxx |1 -
oox/source/drawingml/table/tablepartstylecontext.cxx |1 -
oox/source/drawingml/table/tableproperties.cxx |9 -
oox/source/drawingml/table/tablerow.cxx |1 -
oox/source/drawingml/table/tablerowcontext.cxx |1 -
oox/source/drawingml/table/tablestylecellstylecontext.cxx|1 -
oox/source/drawingml/table/tablestylecontext.cxx |1 -
oox/source/drawingml/table/tablestylelistfragmenthandler.cxx |3 ---
oox/source/drawingml/table/tablestylepart.cxx|1 -
oox/source/drawingml/table/tablestyletextstylecontext.cxx|1 -
13 files changed, 9 insertions(+), 24 deletions(-)
New commits:
commit 74e858693e4c8e5b87730033706656a220f71cfc
Author: José Guilherme Vanz guilherme@gmail.com
Date: Thu Dec 6 22:19:41 2012 -0200
::rtl:: prefixes removal
This commit removes some ::rtl:: prefixes on oox
Change-Id: Iae9a89f8a869934b6273a1b97c0a9243b0504fb3
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1260
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index e6e6307..52511ab 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -27,7 +27,6 @@ using namespace ::oox::core;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-using ::rtl::OUString;
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index c89a4f9..7394acb 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -33,7 +33,6 @@
#include com/sun/star/drawing/TextHorizontalAdjust.hpp
#include com/sun/star/text/XText.hpp
-using rtl::OUString;
using namespace ::oox::core;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -124,11 +123,11 @@ void applyTableStylePart( oox::drawingml::FillProperties
rFillProperties,
void applyTableCellProperties( const Reference
::com::sun::star::table::XCell rxCell, const TableCell rTableCell )
{
-static const rtl::OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM(
TextUpperDistance ) );
-static const rtl::OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM(
TextLowerDistance ) );
-static const rtl::OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM(
TextLeftDistance ) );
-static const rtl::OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM(
TextRightDistance ) );
-static const rtl::OUString sVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM(
TextVerticalAdjust ) );
+static const OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM(
TextUpperDistance ) );
+static const OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM(
TextLowerDistance ) );
+static const OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM(
TextLeftDistance ) );
+static const OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM(
TextRightDistance ) );
+static const OUString sVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM(
TextVerticalAdjust ) );
Reference XPropertySet xPropSet( rxCell, UNO_QUERY_THROW );
xPropSet-setPropertyValue( sTopBorder, Any( static_cast sal_Int32 (
rTableCell.getTopMargin() / 360 ) ) );
diff --git a/oox/source/drawingml/table/tablecellcontext.cxx
b/oox/source/drawingml/table/tablecellcontext.cxx
index 0e972e3..0c9e9bb 100644
--- a/oox/source/drawingml/table/tablecellcontext.cxx
+++ b/oox/source/drawingml/table/tablecellcontext.cxx
@@ -27,7 +27,6 @@
using namespace ::oox::core;
using namespace ::com::sun::star;
-using ::rtl::OUString;
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/source/drawingml/table/tablecontext.cxx
b/oox/source/drawingml/table/tablecontext.cxx
index 44a5b2f..15f9776 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -27,7 +27,6 @@
using namespace ::oox::core;
using namespace ::com::sun::star;
-using ::rtl::OUString;
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx
b/oox/source/drawingml/table/tablepartstylecontext.cxx
index 6ba830e..9386fa1 100644
--- a/oox/source/drawingml/table/tablepartstylecontext.cxx
+++
[PUSHED] ::rtl:: removal in oox
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1259 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1259 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb3be70695c48eb0a02fdf285a0c049e244d613e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
-Werror,-Wtautological-constant-out-of-range-compare
Stephan Bergmann has abandoned this change. Change subject: -Werror,-Wtautological-constant-out-of-range-compare .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1255 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I1c9cf55e2a0ca9d725ce65d8f0a0748e4ca13886 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: Resolves: fdo#51638 In unopkg gui dispose component contex...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1263 -- To view, visit https://gerrit.libreoffice.org/1263 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] ::rtl:: prefixes removal
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1260 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1260 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae9a89f8a869934b6273a1b97c0a9243b0504fb3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] ::rtl:: prefixes removal in oox
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1261 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1261 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c5ad9805ec2e8ed1092c56fe32e6901fdbd2b67 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: José Guilherme Vanz guilherme@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/writerwordglue.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 7d88aac6029353c293dfdacbfa462d62c0da69ea
Author: Luke Deller l...@deller.id.au
Date: Wed Dec 5 23:09:38 2012 +1100
fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .doc
Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Reviewed-on: https://gerrit.libreoffice.org/1251
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 3ae8a1c..2af44cd 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -349,6 +349,8 @@ namespace sw
const SwColumns rFollowColumns = rFollowCols.GetColumns();
const SvxLRSpaceItem rOneLR = rTitleFmt.GetLRSpace();
const SvxLRSpaceItem rTwoLR= rFollowFmt.GetLRSpace();
+const SwFmtFrmSize rFirstFrmSize = rTitleFmt.GetFrmSize();
+const SwFmtFrmSize rFollowFrmSize = rFollowFmt.GetFrmSize();
if (rFirstColumns.size() != rFollowColumns.size())
{
@@ -357,6 +359,8 @@ namespace sw
}
else if (rOneLR != rTwoLR)
bPlausableTitlePage = false;
+else if (rFirstFrmSize != rFollowFrmSize)
+bPlausableTitlePage = false;
else
{
HdFtDistanceGlue aOne(rTitleFmt.GetAttrSet());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fix for fdo#57551: landscape/portrait sequence lost in FILES...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1251 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1251 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +-
writerfilter/source/rtftok/rtfsprm.cxx | 58 -
writerfilter/source/rtftok/rtfsprm.hxx | 67 -
3 files changed, 92 insertions(+), 40 deletions(-)
New commits:
commit a48e2fd9049797110b3b2505c363557284987ca8
Author: Michael Meeks michael.me...@suse.com
Date: Fri Dec 7 13:16:23 2012 +
fdo#44736 - convert RTFSprms to a copy-on-write structure.
Also try to avoid copy/delete thrash of RTFParserState.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aa90d3b..78bd105 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3407,16 +3407,15 @@ int RTFDocumentImpl::pushState()
checkUnicode();
m_nGroupStartPos = Strm().Tell();
-RTFParserState aState(this);
+
if (m_aStates.empty())
-aState = m_aDefaultState;
+ m_aStates.push(m_aDefaultState);
else
{
if (m_aStates.top().nDestinationState == DESTINATION_MR)
lcl_DestinationToMath(m_aStates.top().aDestinationText,
m_aMathBuffer);
-aState = m_aStates.top();
+ m_aStates.push(m_aStates.top());
}
-m_aStates.push(aState);
m_aStates.top().aDestinationText.setLength(0);
m_pTokenizer-pushGroup();
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index 2958cde..e11dbe6 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -99,7 +100,7 @@ std::string RTFSprm::toString() const
RTFValue::Pointer_t RTFSprms::find(Id nKeyword)
{
-for (RTFSprms::Iterator_t i = m_aSprms.begin(); i != m_aSprms.end(); ++i)
+for (RTFSprms::Iterator_t i = m_pSprms-begin(); i != m_pSprms-end(); ++i)
if (i-first == nKeyword)
return i-second;
RTFValue::Pointer_t pValue;
@@ -108,33 +109,39 @@ RTFValue::Pointer_t RTFSprms::find(Id nKeyword)
void RTFSprms::set(Id nKeyword, RTFValue::Pointer_t pValue, bool bOverwrite)
{
+ensureCopyBeforeWrite();
if (bOverwrite)
{
-for (RTFSprms::Iterator_t i = m_aSprms.begin(); i != m_aSprms.end();
++i)
+for (RTFSprms::Iterator_t i = m_pSprms-begin(); i != m_pSprms-end();
++i)
if (i-first == nKeyword)
{
i-second = pValue;
return;
}
}
-m_aSprms.push_back(std::make_pair(nKeyword, pValue));
+m_pSprms-push_back(std::make_pair(nKeyword, pValue));
}
bool RTFSprms::erase(Id nKeyword)
{
-for (RTFSprms::Iterator_t i = m_aSprms.begin(); i != m_aSprms.end(); ++i)
+ensureCopyBeforeWrite();
+for (RTFSprms::Iterator_t i = m_pSprms-begin(); i != m_pSprms-end(); ++i)
+{
if (i-first == nKeyword)
{
-m_aSprms.erase(i);
+m_pSprms-erase(i);
return true;
}
+}
return false;
}
void RTFSprms::deduplicate(RTFSprms rReference)
{
-RTFSprms::Iterator_t i = m_aSprms.begin();
-while (i != m_aSprms.end())
+ensureCopyBeforeWrite();
+
+RTFSprms::Iterator_t i = m_pSprms-begin();
+while (i != m_pSprms-end())
{
bool bIgnore = false;
if (i-first != NS_rtf::LN_ISTD)
@@ -144,33 +151,56 @@ void RTFSprms::deduplicate(RTFSprms rReference)
bIgnore = true;
}
if (bIgnore)
-i = m_aSprms.erase(i);
+i = m_pSprms-erase(i);
else
++i;
}
}
+void RTFSprms::ensureCopyBeforeWrite()
+{
+if (m_pSprms-m_nRefCount 1) {
+boost::intrusive_ptrRTFSprmsImpl pClone(new RTFSprmsImpl());
+for (std::vector std::pairId, RTFValue::Pointer_t ::const_iterator
i = m_pSprms-begin(); i != m_pSprms-end(); ++i)
+pClone-push_back(std::make_pair(i-first,
RTFValue::Pointer_t(i-second-Clone(;
+m_pSprms = pClone;
+assert(m_pSprms-m_nRefCount == 1);
+}
+}
+
RTFSprms::RTFSprms()
-: m_aSprms()
+: m_pSprms(new RTFSprmsImpl())
+{
+}
+
+RTFSprms::~RTFSprms()
{
}
RTFSprms::RTFSprms(const RTFSprms rSprms)
{
-for (std::vector std::pairId, RTFValue::Pointer_t ::const_iterator i =
rSprms.m_aSprms.begin(); i != rSprms.m_aSprms.end(); ++i)
-m_aSprms.push_back(std::make_pair(i-first,
RTFValue::Pointer_t(i-second-Clone(;
+*this = rSprms;
}
RTFSprms RTFSprms::operator=(const RTFSprms rOther)
{
-RTFSprms aTmp(rOther);
-swap(aTmp);
+m_pSprms = rOther.m_pSprms;
return *this;
}
void RTFSprms::swap(RTFSprms rOther)
{
-m_aSprms.swap(rOther.m_aSprms);
+boost::intrusive_ptrRTFSprmsImpl pTmp = rOther.m_pSprms;
+rOther.m_pSprms = m_pSprms;
+m_pSprms = pTmp;
+}
+
+void
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/drivers/odbcbase/OResultSet.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 465d3512cca457c79e6ef85ad1cbf6bcc88e8882
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Dec 7 14:46:46 2012 +0100
no SAL_CALL for internal utility functions
Change-Id: I789f8419a8020b8f5bc7a7a54639b076c1524e48
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index da69815..29c834e 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -635,7 +635,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex,
const Reference ::co
return getValueORowSetValue( columnIndex ).makeAny();
}
// -
-::rtl::OUString SAL_CALL OResultSet::impl_getString( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+::rtl::OUString OResultSet::impl_getString( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
@@ -1173,7 +1173,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw(
SQLException, RuntimeException)
throw SQLException();
return m_aRow[0].makeAny();
}
-Sequencesal_Int8 SAL_CALL OResultSet::impl_getBookmark( ) throw(
SQLException, RuntimeException)
+Sequencesal_Int8 OResultSet::impl_getBookmark( ) throw( SQLException,
RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, odbc, ocke.jans...@sun.com,
OResultSet::getBookmark );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.0.0.0 beta1 available for testing
Hi *, for the upcoming new version 4.0.0, we today upload a first beta1 build that is (almost) feature-complete. For further milestones on the way towards 4.0.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#4.0_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.0.0 alpha1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-release-4.0.0.0.beta1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/text/porrst.cxx | 10 +-
sw/source/core/text/porrst.hxx | 10 +-
sw/source/core/text/portab.hxx |2 +-
sw/source/core/text/portxt.cxx |6 +++---
sw/source/core/text/redlnitr.hxx |8
sw/source/core/text/txtdrop.cxx | 16
sw/source/core/text/txtfly.cxx | 18 +-
sw/source/core/text/txtfrm.cxx | 34 +-
sw/source/core/text/txtftn.cxx | 34 +-
9 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit a25b3dd6c474f2a496c0ba2b1d24926ea60417da
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Dec 7 23:46:54 2012 +0900
sal_Bool to bool
Change-Id: I4f4778ff0bb14ddb3e4ae5f9b76104fc8bed
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 7c03572..cb35c4c 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -126,7 +126,7 @@ void SwBreakPortion::HandlePortion( SwPortionHandler rPH )
const
SwKernPortion::SwKernPortion( SwLinePortion rPortion, short nKrn,
- sal_Bool bBG, sal_Bool bGK ) :
+ bool bBG, bool bGK ) :
nKern( nKrn ), bBackground( bBG ), bGridKern( bGK )
{
Height( rPortion.Height() );
@@ -139,7 +139,7 @@ SwKernPortion::SwKernPortion( SwLinePortion rPortion,
short nKrn,
}
SwKernPortion::SwKernPortion( const SwLinePortion rPortion ) :
-nKern( 0 ), bBackground( sal_False ), bGridKern( sal_True )
+nKern( 0 ), bBackground( false ), bGridKern( true )
{
Height( rPortion.Height() );
SetAscent( rPortion.GetAscent() );
@@ -191,7 +191,7 @@ void SwKernPortion::FormatEOL( SwTxtFormatInfo rInf )
}
SwArrowPortion::SwArrowPortion( const SwLinePortion rPortion ) :
-bLeft( sal_True )
+bLeft( true )
{
Height( rPortion.Height() );
SetAscent( rPortion.GetAscent() );
@@ -200,7 +200,7 @@ SwArrowPortion::SwArrowPortion( const SwLinePortion
rPortion ) :
}
SwArrowPortion::SwArrowPortion( const SwTxtPaintInfo rInf )
-: bLeft( sal_False )
+: bLeft( false )
{
Height( (sal_uInt16)(rInf.GetTxtFrm()-Prt().Height()) );
aPos.X() = rInf.GetTxtFrm()-Frm().Left() +
@@ -320,7 +320,7 @@ sal_Bool SwTxtFrm::FormatEmpty()
{
SwTxtFly aTxtFly( this );
SwRect aRect;
-sal_Bool bFirstFlyCheck = 0 != Prt().Height();
+bool bFirstFlyCheck = 0 != Prt().Height();
if ( !bCollapse bFirstFlyCheck
aTxtFly.IsOn() aTxtFly.IsAnyObj( aRect ) )
return sal_False;
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 38edfcb..e613f57 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -66,8 +66,8 @@ public:
class SwKernPortion : public SwLinePortion
{
short nKern;
-sal_Bool bBackground;
-sal_Bool bGridKern;
+bool bBackground;
+bool bGridKern;
public:
@@ -77,7 +77,7 @@ public:
// bGridKern indicates, that the kerning portion is used to provide
// additional space in grid mode.
SwKernPortion( SwLinePortion rPortion, short nKrn,
- sal_Bool bBG = sal_False, sal_Bool bGridKern = sal_False );
+ bool bBG = false, bool bGridKern = false );
// This constructor only sets the height and ascent to the values
// of rPortion. It is only used for kerning portions for grid mode
@@ -96,13 +96,13 @@ public:
class SwArrowPortion : public SwLinePortion
{
Point aPos;
-sal_Bool bLeft;
+bool bLeft;
public:
SwArrowPortion( const SwLinePortion rPortion );
SwArrowPortion( const SwTxtPaintInfo rInf );
virtual void Paint( const SwTxtPaintInfo rInf ) const;
virtual SwLinePortion *Compress();
-inline sal_Bool IsLeft() const { return bLeft; }
+inline bool IsLeft() const { return bLeft; }
inline const Point GetPos() const { return aPos; }
OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 63a8f37..75841be 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -41,7 +41,7 @@ public:
sal_Bool PostFormat( SwTxtFormatInfo rInf );
inline sal_Bool IsFilled() const { return 0 != cFill; }
inline KSHORT GetTabPos() const { return nTabPos; }
-inline sal_Bool IsAutoTabStop() const { return bAutoTabStop; }
+inline bool IsAutoTabStop() const { return bAutoTabStop; }
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler rPH ) const;
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 3f5934a..617cf39 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -150,7 +150,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo rInf,
const XubString* pStr
// Here starts
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/odbcbase/OResultSet.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 45237f80237f202b278f0561e6b93db2a2306b6a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Dec 7 15:55:50 2012 +0100
remove unwanted SAL_CALL
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index da69815..4dbf90f 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -635,13 +635,13 @@ Any SAL_CALL OResultSet::getObject( sal_Int32
columnIndex, const Reference ::co
return getValueORowSetValue( columnIndex ).makeAny();
}
// -
-::rtl::OUString SAL_CALL OResultSet::impl_getString( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+::rtl::OUString OResultSet::impl_getString( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
return
OTools::getStringValue(m_pStatement-getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding);
}
-::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+::rtl::OUString OResultSet::getString( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
{
return getValuertl::OUString( columnIndex );
}
@@ -1173,7 +1173,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw(
SQLException, RuntimeException)
throw SQLException();
return m_aRow[0].makeAny();
}
-Sequencesal_Int8 SAL_CALL OResultSet::impl_getBookmark( ) throw(
SQLException, RuntimeException)
+Sequencesal_Int8 OResultSet::impl_getBookmark( ) throw( SQLException,
RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, odbc, ocke.jans...@sun.com,
OResultSet::getBookmark );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57215, which changed state. Bug 57215 Summary: Wrong text rotation in SVG Export (rotated text appears as non-rotated) https://bugs.freedesktop.org/show_bug.cgi?id=57215 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: compilerplugins/Makefile-clang.mk config_host.mk.in configure.ac
compilerplugins/Makefile-clang.mk |8 ++--
config_host.mk.in |3 ++-
configure.ac | 15 +--
3 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit a6d6d1c24ba497ac8586857baed9d4fb155a17b1
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 16:07:41 2012 +0100
CLANGPLUGIN_CPPFLAGS did not actually work
...it just appeared to work on machines that happen to have /usr/bin/clang.
So
hoist CLANGDIR/CLANGBUILD from compilerplugins/Makefile-clang.mk to
configure.ac
instead.
Change-Id: Ie5d9c6bb8e9d0caa1583d78c8693f06b69873095
diff --git a/compilerplugins/Makefile-clang.mk
b/compilerplugins/Makefile-clang.mk
index 9b24df0..4d405e9 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -22,10 +22,6 @@ CLANGSRC= \
# Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin)
CLANGCXXFLAGS=-O2 -Wall -g
-# The prefix where Clang resides, override to where Clang resides if using a
source build.
-CLANGDIR=/usr
-# The build directory (different from CLANGDIR if using a Clang out-of-source
build)
-CLANGBUILD=/usr
# The uninteresting rest.
@@ -56,7 +52,7 @@ CLANGOBJS=
define clangbuildsrc
$(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk
$(CLANGOUTDIR)/clang-timestamp
@echo [build CXX] $(subst $(SRCDIR)/,,$(2))
- $(CXX) $(CLANGPLUGIN_CPPFLAGS) $(CLANGCXXFLAGS) $(CLANGDEFS)
$(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF
$(CLANGOUTDIR)/$(1).d
+ $(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES)
-DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF
$(CLANGOUTDIR)/$(1).d
-include $(CLANGOUTDIR)/$(1).d
@@ -71,7 +67,7 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS)
$(CXX) -shared $(CLANGOBJS) -o $@
# Clang most probably doesn't maintain binary compatibility, so rebuild when
clang changes.
-$(CLANGOUTDIR)/clang-timestamp: $(CLANGBUILD)/bin/clang
+$(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang
touch $@ -r $^
# vim: set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index 12a0752..b140600 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -53,7 +53,8 @@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
@x_CFLAGS@ export CFLAGS=@CFLAGS@
export CHECK_PARALLELISM?=@CHECK_PARALLELISM@
-export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
+export CLANGBUILD=@CLANGBUILD@
+export CLANGDIR=@CLANGDIR@
export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 8186eb6..d0178d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5296,9 +5296,19 @@ if test $COM_GCC_IS_CLANG = TRUE; then
compiler_plugins=no
fi
if test $compiler_plugins != no; then
+dnl The prefix where Clang resides, override to where Clang resides if
+dnl using a source build:
+if test -z $CLANGDIR; then
+CLANGDIR=/usr
+fi
+dnl The build directory (different from CLANGDIR if using a Clang out-
+dnl of-source build):
+if test -z $CLANGBUILD; then
+CLANGBUILD=/usr
+fi
AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS=$CPPFLAGS $CLANGPLUGIN_CPPFLAGS -D__STDC_CONSTANT_MACROS
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+CPPFLAGS=$CPPFLAGS -I$CLANGDIR/include
-I$CLANGDIR/tools/clang/include -I$CLANGBUILD/include
-I$CLANGBUILD/tools/clang/include -D__STDC_CONSTANT_MACROS
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
[COMPILER_PLUGINS=TRUE],
[
@@ -5318,7 +5328,8 @@ else
fi
fi
AC_SUBST(COMPILER_PLUGINS)
-AC_SUBST(CLANGPLUGIN_CPPFLAGS)
+AC_SUBST(CLANGDIR)
+AC_SUBST(CLANGBUILD)
dnl ===
dnl Set the MinGW sys-root
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - src/docdraw.py src/docrecord.py
src/docdraw.py | 68 ---
src/docrecord.py |4 +--
2 files changed, 22 insertions(+), 50 deletions(-)
New commits:
commit e78e15a34c5b4221cb486784774ca6e6127b06a0
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 7 16:14:41 2012 +0100
docdraw: add common base for OfficeArtDggContainer/OfficeArtDgContainer
diff --git a/src/docdraw.py b/src/docdraw.py
index d10065b..02138c1 100644
--- a/src/docdraw.py
+++ b/src/docdraw.py
@@ -11,16 +11,16 @@ from docdirstream import DOCDirStream
import docsprm
import msodraw
-class OfficeArtDggContainer(DOCDirStream):
-The OfficeArtDggContainer record type specifies the container for all
the OfficeArt file records that contain document-wide data.
-def __init__(self, officeArtContent, name):
-DOCDirStream.__init__(self, officeArtContent.bytes)
+class OfficeArtContainer(DOCDirStream):
+def __init__(self, parent, name, type):
+DOCDirStream.__init__(self, parent.bytes)
self.name = name
-self.pos = officeArtContent.pos
-self.officeArtContent = officeArtContent
+self.type = type
+self.pos = parent.pos
+self.parent = parent
def dumpXml(self):
-print '%s type=OfficeArtDggContainer offset=%d' % (self.name,
self.pos)
+print '%s type=%s offset=%d' % (self.name, self.type, self.pos)
self.rh = msodraw.RecordHeader(self)
self.rh.dumpXml(self)
pos = self.pos
@@ -43,11 +43,21 @@ class OfficeArtDggContainer(DOCDirStream):
child.dumpXml(self, rh)
self.pos = posOrig
else:
-print 'todo what=OfficeArtDggContainer: recType = %s
unhandled (size: %d bytes)/' % (hex(rh.recType), rh.recLen)
+print 'todo what=%s: recType = %s unhandled (size: %d
bytes)/' % (self.type, hex(rh.recType), rh.recLen)
pos += rh.recLen
print '/%s' % self.name
assert pos == self.pos + self.rh.recLen
-self.officeArtContent.pos = pos
+self.parent.pos = pos
+
+class OfficeArtDggContainer(OfficeArtContainer):
+The OfficeArtDggContainer record type specifies the container for all
the OfficeArt file records that contain document-wide data.
+def __init__(self, officeArtContent, name):
+OfficeArtContainer.__init__(self, officeArtContent, name,
OfficeArtDggContainer)
+
+class OfficeArtDgContainer(OfficeArtContainer):
+The OfficeArtDgContainer record specifies the container for all the
file records for the objects in a drawing.
+def __init__(self, officeArtContent, name):
+OfficeArtContainer.__init__(self, officeArtContent, name,
OfficeArtDgContainer)
class OfficeArtSpContainer(DOCDirStream):
The OfficeArtSpContainer record specifies a shape container.
@@ -121,44 +131,6 @@ class OfficeArtSpgrContainer(DOCDirStream):
assert pos == self.pos + self.rh.recLen
self.pos = pos
-class OfficeArtDgContainer(DOCDirStream):
-The OfficeArtDgContainer record specifies the container for all the
file records for the objects in a drawing.
-def __init__(self, officeArtContent, name):
-DOCDirStream.__init__(self, officeArtContent.bytes)
-self.name = name
-self.pos = officeArtContent.pos
-self.officeArtContent = officeArtContent
-
-def dumpXml(self):
-print '%s type=OfficeArtDgContainer offset=%d' % (self.name,
self.pos)
-self.rh = msodraw.RecordHeader(self)
-self.rh.dumpXml(self)
-pos = self.pos
-while (self.rh.recLen - (pos - self.pos)) 0:
-posOrig = self.pos
-self.pos = pos
-rh = msodraw.RecordHeader(self)
-rh.dumpXml(self)
-self.pos = posOrig
-pos += msodraw.RecordHeader.size
-if rh.recType in recMap:
-if len(recMap[rh.recType]) == 2:
-child = recMap[rh.recType][0](self, pos)
-child.dumpXml(self, rh)
-assert child.pos == pos + rh.recLen
-else:
-posOrig = self.pos
-self.pos = pos
-child = recMap[rh.recType][0](self)
-child.dumpXml(self, rh)
-self.pos = posOrig
-else:
-print 'todo what=OfficeArtDgContainer: recType = %s
unhandled (size: %d bytes)/' % (hex(rh.recType), rh.recLen)
-pos += rh.recLen
-print '/%s' % self.name
-assert pos == self.pos + self.rh.recLen
-self.officeArtContent.pos = pos
-
recMap = {
0xf003: [OfficeArtSpgrContainer, True],
0xf004: [OfficeArtSpContainer, True],
commit b6ba97f4f6d0105855418a07d99ec5a98c2fad50
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 7 16:03:53 2012 +0100
docdraw: dump - dumpXml
diff --git a/src/docdraw.py b/src/docdraw.py
index d7a861d..d10065b 100644
---
[Libreoffice-commits] .: qadevOOo/tests
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 46 +---
1 file changed, 37 insertions(+), 9 deletions(-)
New commits:
commit 21ea372541a81972aa33cb2226dbc2ee3886e23a
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 7 16:21:34 2012 +0100
Use XNotifyingDispatch to avoid races
Change-Id: Ia91bd08122052f5ea206eb9e6c03524e6e3ec245
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index e1b5019..93dc2e2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -36,10 +36,13 @@ import com.sun.star.accessibility.XAccessibleContext;
import com.sun.star.accessibility.XAccessibleStateSet;
import com.sun.star.awt.XWindow;
import com.sun.star.container.XIndexAccess;
+import com.sun.star.frame.DispatchResultEvent;
import com.sun.star.frame.XController;
-import com.sun.star.frame.XDispatch;
import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.frame.XDispatchResultListener;
import com.sun.star.frame.XModel;
+import com.sun.star.frame.XNotifyingDispatch;
+import com.sun.star.lang.EventObject;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sheet.XSpreadsheet;
import com.sun.star.sheet.XSpreadsheetDocument;
@@ -124,18 +127,44 @@ public class ScAccessiblePageHeaderArea extends TestCase {
aParseURL[0].Complete = .uno:PrintPreview;
xParser.parseStrict(aParseURL);
URL aURL = aParseURL[0];
-XDispatch xDispatcher = xDispProv.queryDispatch(aURL, , 0);
-if(xDispatcher != null)
-xDispatcher.dispatch( aURL, null );
+XNotifyingDispatch xDispatcher = UnoRuntime.queryInterface(
+XNotifyingDispatch.class, xDispProv.queryDispatch(aURL, ,
0));
+final int[] ok = new int[] { 0 };
+XDispatchResultListener listener = new XDispatchResultListener() {
+public void disposing(EventObject Source) {
+synchronized (ok) {
+if (ok[0] == 0) {
+ok[0] = 1;
+}
+ok.notifyAll();
+}
+}
+public void dispatchFinished(DispatchResultEvent Result) {
+synchronized (ok) {
+ok[0] = 2;
+ok.notifyAll();
+}
+}
+};
+xDispatcher.dispatchWithNotification(
+aURL, null, listener);
+synchronized (ok) {
+while (ok[0] == 0) {
+try {
+ok.wait();
+} catch (InterruptedException e) {
+throw new RuntimeException(e);
+}
+}
+if (ok[0] != 2) {
+throw new RuntimeException(missing disptachFinished);
+}
+}
} catch (com.sun.star.uno.Exception e) {
log.println(Couldn't change mode);
throw new StatusException(Status.failed(Couldn't change mode));
}
-try {
-Thread.sleep(500);
-} catch (InterruptedException ex) {}
-
AccessibilityTools at = new AccessibilityTools();
XWindow xWindow = at.getCurrentContainerWindow( (XMultiServiceFactory)
Param.getMSF(), aModel);
@@ -213,4 +242,4 @@ public class ScAccessiblePageHeaderArea extends TestCase {
throw new StatusException( Couldn't create document , e );
}
}
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57515, which changed state. Bug 57515 Summary: Crash when creating a Table of Contents https://bugs.freedesktop.org/show_bug.cgi?id=57515 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docdraw.py
src/docdraw.py | 53 ++---
1 file changed, 14 insertions(+), 39 deletions(-)
New commits:
commit 3542f2278131f18d421b3e3b5cb15a1d3e4b63e9
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 7 16:38:28 2012 +0100
docdraw: add common base for OfficeArtSpContainer / OfficeArtSpgrContainer
diff --git a/src/docdraw.py b/src/docdraw.py
index 02138c1..5087c53 100644
--- a/src/docdraw.py
+++ b/src/docdraw.py
@@ -59,16 +59,17 @@ class OfficeArtDgContainer(OfficeArtContainer):
def __init__(self, officeArtContent, name):
OfficeArtContainer.__init__(self, officeArtContent, name,
OfficeArtDgContainer)
-class OfficeArtSpContainer(DOCDirStream):
-The OfficeArtSpContainer record specifies a shape container.
-def __init__(self, parent, pos):
+class OfficeArtContainedContainer(DOCDirStream):
+def __init__(self, parent, pos, name, type):
DOCDirStream.__init__(self, parent.bytes)
self.pos = pos
+self.name = name
+self.type = type
self.parent = parent
def dumpXml(self, compat, rh):
self.rh = rh
-print 'shape type=OfficeArtSpContainer'
+print '%s type=OfficeArtSpContainer' % self.name
pos = self.pos
while (self.rh.recLen - (pos - self.pos)) 0:
posOrig = self.pos
@@ -89,47 +90,21 @@ class OfficeArtSpContainer(DOCDirStream):
child.dumpXml(self, rh)
self.pos = posOrig
else:
-print 'todo what=OfficeArtSpContainer: recType = %s
unhandled (size: %d bytes)/' % (hex(rh.recType), rh.recLen)
+print 'todo what=%s: recType = %s unhandled (size: %d
bytes)/' % (self.type, hex(rh.recType), rh.recLen)
pos += rh.recLen
-print '/shape'
+print '/%s' % self.name
assert pos == self.pos + self.rh.recLen
self.pos = pos
-class OfficeArtSpgrContainer(DOCDirStream):
+class OfficeArtSpContainer(OfficeArtContainedContainer):
+The OfficeArtSpContainer record specifies a shape container.
+def __init__(self, parent, pos):
+OfficeArtContainedContainer.__init__(self, parent, pos, shape,
OfficeArtSpContainer)
+
+class OfficeArtSpgrContainer(OfficeArtContainedContainer):
The OfficeArtSpgrContainer record specifies a container for groups of
shapes.
def __init__(self, officeArtDgContainer, pos):
-DOCDirStream.__init__(self, officeArtDgContainer.bytes)
-self.pos = pos
-self.officeArtDgContainer = officeArtDgContainer
-
-def dumpXml(self, compat, rh):
-self.rh = rh
-print 'groupShape type=OfficeArtSpgrContainer offset=%d' %
self.pos
-pos = self.pos
-while (self.rh.recLen - (pos - self.pos)) 0:
-posOrig = self.pos
-self.pos = pos
-rh = msodraw.RecordHeader(self)
-rh.dumpXml(self)
-self.pos = posOrig
-pos += msodraw.RecordHeader.size
-if rh.recType in recMap:
-if len(recMap[rh.recType]) == 2:
-child = recMap[rh.recType][0](self, pos)
-child.dumpXml(self, rh)
-assert child.pos == pos + rh.recLen
-else:
-posOrig = self.pos
-self.pos = pos
-child = recMap[rh.recType][0](self)
-child.dumpXml(self, rh)
-self.pos = posOrig
-else:
-print 'todo what=OfficeArtSpgrContainer: recType = %s
unhandled (size: %d bytes)/' % (hex(rh.recType), rh.recLen)
-pos += rh.recLen
-print '/groupShape'
-assert pos == self.pos + self.rh.recLen
-self.pos = pos
+OfficeArtContainedContainer.__init__(self, officeArtDgContainer, pos,
groupShape, OfficeArtSpgrContainer)
recMap = {
0xf003: [OfficeArtSpgrContainer, True],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 321f44db9b2fa641b62187cd0e61264b3a1f3082
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Dec 7 14:07:50 2012 +0100
Offer update to 3.6.4.3 (3.6.4 Final) + 3.5 up to 3.5.4 updates to 3.6.
diff --git a/check.php b/check.php
index 37a1e66..6ceca34 100644
--- a/check.php
+++ b/check.php
@@ -124,12 +124,12 @@ $update_versions = array(
'281b639-6baa1d3-ef66a77-d866f25-f36d45f' = 'LO-3.6', # 3.5.2 RC2 / Final
# 3.5.3 versions
-'21cb047-d7e6025-9ba54fc-b4a51a8-f42372b' = 'LO-3.5', # 3.5.3 RC1
-'235ab8a-3802056-4a8fed3-2d66ea8-e241b80' = 'LO-3.5', # 3.5.3 RC2 / Final
+'21cb047-d7e6025-9ba54fc-b4a51a8-f42372b' = 'LO-3.6', # 3.5.3 RC1
+'235ab8a-3802056-4a8fed3-2d66ea8-e241b80' = 'LO-3.6', # 3.5.3 RC2 / Final
# 3.5.4 versions
-'7306755-f4f605c-738527d-1cf4bc1-9930dc8' = 'LO-3.5', # 3.5.4 RC1
-'165a79a-7059095-e13bb37-fef39a4-9503d18' = 'LO-3.5', # 3.5.4 RC2 / Final
+'7306755-f4f605c-738527d-1cf4bc1-9930dc8' = 'LO-3.6', # 3.5.4 RC1
+'165a79a-7059095-e13bb37-fef39a4-9503d18' = 'LO-3.6', # 3.5.4 RC2 / Final
# 3.5.5 versions
'c9944f7-48b7ff5-0507789-54a4c8a-8b242a8' = 'LO-3.5', # 3.5.5 RC1
@@ -165,8 +165,12 @@ $update_versions = array(
# 3.6.3 versions
'f8fce0b-300fad7-0c1a2b6-334b928-da36a9' = 'LO-3.6', # 3.6.3.1
-# To be uncommented when 3.6.4 Final is out
-#'58f22d5-270d05a-e2abed1-ea17a85-9b5702' = 'LO-3.6', # 3.6.3.2 / Final
+'58f22d5-270d05a-e2abed1-ea17a85-9b5702' = 'LO-3.6', # 3.6.3.2 / Final
+
+# 3.6.4 versions
+'a9a0717-273e462-768e6e3-978247f-65e65f' = 'LO-3.6', # 3.6.4.1
+# To be uncommented when 3.6.5 Final is out
+#'2ef5aff-a6fb0ff-166bdff-cf087ad-0f1389' = 'LO-3.6', # 3.6.4.3 / Final
[3.5.4.2 was skipped]
);
# Descriptions of the target versions
@@ -193,9 +197,9 @@ $update_map = array(
# 'update_type' = 'text/html',
# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
-'LO-3.6' = array('gitid' =
'58f22d5-270d05a-e2abed1-ea17a85-9b5702',
- 'id' = 'LibreOffice 3.6.3',
- 'version' = '3.6.3',
+'LO-3.6' = array('gitid' =
'2ef5aff-a6fb0ff-166bdff-cf087ad-0f1389',
+ 'id' = 'LibreOffice 3.6.4',
+ 'version' = '3.6.4',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] don't display caption number separator on category 'None'
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1265 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/1265/1 don't display caption number separator on category 'None' Change-Id: Id01fb900a3e558d5f9d4613e18f3761cf6a670bf --- M sw/source/ui/frmdlg/cption.cxx 1 file changed, 6 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1265 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id01fb900a3e558d5f9d4613e18f3761cf6a670bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: static clang source code analysis (Code Review Requested)
Hi, The clang analyzer how-to is here : http://wiki.documentfoundation.org/Development/Clang Regards, John Smith. On Fri, Dec 7, 2012 at 11:08 AM, John Smith lbalba...@gmail.com wrote: Hi, For the lcov reports, I put the following in the wiki: http://wiki.documentfoundation.org/Development/Lcov Feel free to try it out and edit it as you see fit. Regards, John Smith. On Wed, Dec 5, 2012 at 5:33 PM, Miklos Vajna vmik...@suse.cz wrote: On Wed, Dec 05, 2012 at 04:15:45PM +0100, John Smith lbalba...@gmail.com wrote: Sure, I can put short tutorials for generating both reports on the wiki. How do I get a wiki account, and where on the wiki should I put them ? Creating a wiki account: https://wiki.documentfoundation.org/index.php?title=Special:UserLogintype=signup I would create a page called http://wiki.documentfoundation.org/Development/Something, and link it from the Development page. Alternatively, just create two scripts that do the clang analysis / lcov report, and add it to git: http://wiki.documentfoundation.org/Development#Preparing_patches Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docdraw.py src/docrecord.py
src/docdraw.py | 100 +-- src/docrecord.py |4 +- 2 files changed, 33 insertions(+), 71 deletions(-) New commits: commit eaf5990adaad7fa6087fb89b883101c13e6429b3 Author: Miklos Vajna vmik...@suse.cz Date: Fri Dec 7 16:49:06 2012 +0100 docdraw: remove no longer needed OfficeArtContainedContainer diff --git a/src/docdraw.py b/src/docdraw.py index 5087c53..ac3bcff 100644 --- a/src/docdraw.py +++ b/src/docdraw.py @@ -12,17 +12,21 @@ import docsprm import msodraw class OfficeArtContainer(DOCDirStream): -def __init__(self, parent, name, type): +def __init__(self, parent, name, type, contained): DOCDirStream.__init__(self, parent.bytes) self.name = name self.type = type +self.contained = contained self.pos = parent.pos self.parent = parent -def dumpXml(self): -print '%s type=%s offset=%d' % (self.name, self.type, self.pos) -self.rh = msodraw.RecordHeader(self) -self.rh.dumpXml(self) +def dumpXml(self, recHdl, rh = None): +print '%s type=%s' % (self.name, self.type) +if self.contained: +self.rh = rh +else: +self.rh = msodraw.RecordHeader(self) +self.rh.dumpXml(self) pos = self.pos while (self.rh.recLen - (pos - self.pos)) 0: posOrig = self.pos @@ -32,16 +36,11 @@ class OfficeArtContainer(DOCDirStream): self.pos = posOrig pos += msodraw.RecordHeader.size if rh.recType in recMap: -if len(recMap[rh.recType]) == 2: -child = recMap[rh.recType][0](self, pos) -child.dumpXml(self, rh) -assert child.pos == pos + rh.recLen -else: -posOrig = self.pos -self.pos = pos -child = recMap[rh.recType][0](self) -child.dumpXml(self, rh) -self.pos = posOrig +posOrig = self.pos +self.pos = pos +child = recMap[rh.recType](self) +child.dumpXml(self, rh) +self.pos = posOrig else: print 'todo what=%s: recType = %s unhandled (size: %d bytes)/' % (self.type, hex(rh.recType), rh.recLen) pos += rh.recLen @@ -52,70 +51,33 @@ class OfficeArtContainer(DOCDirStream): class OfficeArtDggContainer(OfficeArtContainer): The OfficeArtDggContainer record type specifies the container for all the OfficeArt file records that contain document-wide data. def __init__(self, officeArtContent, name): -OfficeArtContainer.__init__(self, officeArtContent, name, OfficeArtDggContainer) +OfficeArtContainer.__init__(self, officeArtContent, name, OfficeArtDggContainer, False) class OfficeArtDgContainer(OfficeArtContainer): The OfficeArtDgContainer record specifies the container for all the file records for the objects in a drawing. def __init__(self, officeArtContent, name): -OfficeArtContainer.__init__(self, officeArtContent, name, OfficeArtDgContainer) +OfficeArtContainer.__init__(self, officeArtContent, name, OfficeArtDgContainer, False) -class OfficeArtContainedContainer(DOCDirStream): -def __init__(self, parent, pos, name, type): -DOCDirStream.__init__(self, parent.bytes) -self.pos = pos -self.name = name -self.type = type -self.parent = parent - -def dumpXml(self, compat, rh): -self.rh = rh -print '%s type=OfficeArtSpContainer' % self.name -pos = self.pos -while (self.rh.recLen - (pos - self.pos)) 0: -posOrig = self.pos -self.pos = pos -rh = msodraw.RecordHeader(self) -rh.dumpXml(self) -self.pos = posOrig -pos += msodraw.RecordHeader.size -if rh.recType in recMap: -if len(recMap[rh.recType]) == 2: -child = recMap[rh.recType][0](self, pos) -child.dumpXml(self, rh) -assert child.pos == pos + rh.recLen -else: -posOrig = self.pos -self.pos = pos -child = recMap[rh.recType][0](self) -child.dumpXml(self, rh) -self.pos = posOrig -else: -print 'todo what=%s: recType = %s unhandled (size: %d bytes)/' % (self.type, hex(rh.recType), rh.recLen) -pos += rh.recLen -print '/%s' % self.name -assert pos == self.pos + self.rh.recLen -self.pos = pos - -class OfficeArtSpContainer(OfficeArtContainedContainer): +class OfficeArtSpContainer(OfficeArtContainer): The OfficeArtSpContainer record specifies a shape container. -def __init__(self, parent, pos): -
[Libreoffice-commits] .: src/docdraw.py
src/docdraw.py |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b81b70b7596f150e11ce6aec148f9aa01af4a4e8
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Dec 7 16:51:40 2012 +0100
docdraw: print - recHdl.appendLine
diff --git a/src/docdraw.py b/src/docdraw.py
index ac3bcff..ca62227 100644
--- a/src/docdraw.py
+++ b/src/docdraw.py
@@ -21,7 +21,7 @@ class OfficeArtContainer(DOCDirStream):
self.parent = parent
def dumpXml(self, recHdl, rh = None):
-print '%s type=%s' % (self.name, self.type)
+recHdl.appendLine('%s type=%s' % (self.name, self.type))
if self.contained:
self.rh = rh
else:
@@ -42,9 +42,9 @@ class OfficeArtContainer(DOCDirStream):
child.dumpXml(self, rh)
self.pos = posOrig
else:
-print 'todo what=%s: recType = %s unhandled (size: %d
bytes)/' % (self.type, hex(rh.recType), rh.recLen)
+recHdl.appendLine('todo what=%s: recType = %s unhandled
(size: %d bytes)/' % (self.type, hex(rh.recType), rh.recLen))
pos += rh.recLen
-print '/%s' % self.name
+recHdl.appendLine('/%s' % self.name)
assert pos == self.pos + self.rh.recLen
self.parent.pos = pos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/source sw/source
oox/source/drawingml/customshapeproperties.cxx |7 +++
oox/source/drawingml/shapepropertiescontext.cxx |6 ++
oox/source/drawingml/table/tablecell.cxx| 16 +---
oox/source/drawingml/table/tableproperties.cxx |4 ++--
oox/source/ppt/presentationfragmenthandler.cxx | 19 ++-
oox/source/vml/vmlformatting.cxx|3 +--
sw/source/core/doc/poolfmt.cxx |8 +---
7 files changed, 24 insertions(+), 39 deletions(-)
New commits:
commit 8f45d08f5b918598f1dbeba41ad185edfc446968
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 7 15:56:17 2012 +
fix bogus warning about invalid pool ids
Basically theres a missing else.
make it tell me what it's complaining about while I'm at it
Change-Id: I4f32f483e3826066aed4c31a3355c193525f3c5c
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 2820663..5321944 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1367,11 +1367,11 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const
sal_uInt16 nArrCnt = 1;
bool bFnd = true;
-if( RES_POOLCHR_BEGIN = nId nId RES_POOLCHR_END )
+if (RES_POOLCHR_BEGIN = nId nId RES_POOLCHR_END)
{
pArray[0] = pCharFmtTbl;
}
-if( RES_POOLFRM_BEGIN = nId nId RES_POOLFRM_END )
+else if (RES_POOLFRM_BEGIN = nId nId RES_POOLFRM_END)
{
pArray[0] = pFrmFmtTbl;
pArray[1] = pSpzFrmFmtTbl;
@@ -1379,7 +1379,9 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const
}
else
{
-OSL_FAIL( invalid Id );
+SAL_WARN(sw.core, Invalid Pool Id: nId should be within
+[ int(RES_POOLCHR_BEGIN) , int(RES_POOLCHR_END) )
or
+[ int(RES_POOLFRM_BEGIN) , int(RES_POOLFRM_END)
));
bFnd = false;
}
commit 74ca0e86063f698c8d36d935cd2b791c6b2874b4
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 7 13:27:42 2012 +
drop some static OUStrings
Change-Id: I41d5df892d8b710b82ed886b2390b53535b8a67b
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 8f313a0..ea5dc1f 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -98,10 +98,9 @@ static OUString GetConnectorShapeType( sal_Int32 nType )
OUString sType;
switch( nType )
{
-case XML_straightConnector1: {
-static const OUString sStraightConnector1 = CREATE_OUSTRING(
mso-spt32 );
-sType = sStraightConnector1;
-} break;
+case XML_straightConnector1:
+sType = mso-spt32;
+break;
default:
break;
}
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx
b/oox/source/drawingml/shapepropertiescontext.cxx
index a10b8ea..e0fe19f 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -75,15 +75,13 @@ Reference XFastContextHandler
ShapePropertiesContext::createFastChildContext(
// TODO: Move the following checks to a separate place or as a
separate function
if ( nToken == XML_line )
{
-static const OUString sLineShape(
com.sun.star.drawing.LineShape );
-mrShape.getServiceName() = sLineShape;
+mrShape.getServiceName() = com.sun.star.drawing.LineShape;
}
if( ( nToken = XML_bentConnector2 nToken = XML_bentConnector5
) ||
( nToken = XML_curvedConnector2 nToken =
XML_curvedConnector5 ) ||
nToken == XML_straightConnector1 )
{
-static const OUString sCustomShape(
com.sun.star.drawing.CustomShape );
-mrShape.getServiceName() = sCustomShape;
+mrShape.getServiceName() = com.sun.star.drawing.CustomShape;
}
xRet.set( new PresetShapeGeometryContext( *this, xAttribs,
*(mrShape.getCustomShapeProperties()) ) );
}
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index 7394acb..d81f350 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -123,17 +123,11 @@ void applyTableStylePart( oox::drawingml::FillProperties
rFillProperties,
void applyTableCellProperties( const Reference
::com::sun::star::table::XCell rxCell, const TableCell rTableCell )
{
-static const OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM(
TextUpperDistance ) );
-static const OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM(
TextLowerDistance ) );
-static const OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM(
TextLeftDistance ) );
-static const OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM(
TextRightDistance ) );
Re: random number generators for calc
Hey Tino, 2012/12/6 tino ttk...@gmail.com: just happened to reimplement RAND() with a B.A Wichmann and I.D Hill generator.. see As they are entitled to. No doubt we'll come up with a comprehensive, nicely architected and beautiful solution of our own :-) Ok, I'll go ahead with a suggestion then. :) Attached patch is just a simple wrapper around boost, to be used like sc::rng::seed() to replace libc srand() sc::rng::rand() to replace libc rand() and a few more distributions. I've also modified ScInterpreter::ScRandom() to simply call sc::rng::uniform() which should solve bug 33365. I've not modified RANDBETWEEN(a,b) yet but this could simply call sc::rng::uniform_int(a,b). Also, the rand in Basic could be changed in the future. Small problems: - compiler warnings from within boost We need to patch them out otherwise the Werror build will fail. It seems that these warnings are also fixed upstream. - few asserts might need to be replaced asserts are fine in the code. They are only used in debug and dbgutil builds, so will normally not show up in releases but helpt to find bugs earlier. Just a few more comments about the patch. We need to ifdef all unused methods in random.[ch]xx otherwise they will be removed in nearly no time. We are removing unused functions to clean the codebase. Please also don't leave old code commented, we have git for code history so we don't need to keep all code as comments. Before I'll push the change with these modifications I'll check with a big file containing a lot of RANDOM functions to check that we are not introducing a performance regression. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/frmdlg/cption.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit dd629829c78c294ccbc93c885bbaae11bb72b20b
Author: Jack Leigh leigh...@gmx.se
Date: Fri Dec 7 15:30:45 2012 +
don't display caption number separator on category 'None'
Change-Id: Id01fb900a3e558d5f9d4613e18f3761cf6a670bf
Reviewed-on: https://gerrit.libreoffice.org/1265
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index f9a3f5b..5d7f6eb 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -278,12 +278,17 @@ void SwCaptionDialog::Apply()
aOpt.UseCaption() = sal_True;
String aName( aCategoryBox.GetText() );
if ( aName == sNone )
+{
aOpt.SetCategory( aEmptyStr );
+aOpt.SetNumSeparator( aEmptyStr );
+}
else
+{
aOpt.SetCategory(comphelper::string::strip(aName, ' '));
+aOpt.SetNumSeparator( aNumberingSeparatorED.GetText() );
+}
aOpt.SetNumType( (sal_uInt16)(sal_uIntPtr)aFormatBox.GetEntryData(
aFormatBox.GetSelectEntryPos() ) );
aOpt.SetSeparator( aSepEdit.IsEnabled() ? aSepEdit.GetText() : String() );
-aOpt.SetNumSeparator( aNumberingSeparatorED.GetText() );
aOpt.SetCaption( aTextEdit.GetText() );
aOpt.SetPos( aPosBox.GetSelectEntryPos() );
aOpt.IgnoreSeqOpts() = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] don't display caption number separator on category 'None'
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1265 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1265 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id01fb900a3e558d5f9d4613e18f3761cf6a670bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Jack Leigh leigh...@gmx.se ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 08d2a6532ece404f12dd5dbc84f0d6122db5abd5
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Dec 7 18:06:08 2012 +0100
Emacs modeline + whitespace fix.
Change-Id: I89b08c4125495d8d1b06ca9509e31dd5222dee22
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 78bd105..ef3be2b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -3409,12 +3410,12 @@ int RTFDocumentImpl::pushState()
m_nGroupStartPos = Strm().Tell();
if (m_aStates.empty())
- m_aStates.push(m_aDefaultState);
+m_aStates.push(m_aDefaultState);
else
{
if (m_aStates.top().nDestinationState == DESTINATION_MR)
lcl_DestinationToMath(m_aStates.top().aDestinationText,
m_aMathBuffer);
- m_aStates.push(m_aStates.top());
+m_aStates.push(m_aStates.top());
}
m_aStates.top().aDestinationText.setLength(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ATTENTION] Git repo move to gerrit.libreoofice.org
On Fri, Dec 7, 2012 at 10:07 AM, Korrawit Pruegsanusak detective.conan.1...@gmail.com wrote: Hello Norbert, On Thu, Dec 6, 2012 at 8:12 AM, Norbert Thiebaud nthieb...@gmail.com wrote: that include contrib/buildbot contrib/libvisio contrib/test-files cppunit libcdr libexttextcat libmspub templates voting I'm trying to get the fdo admin to do the change needed to prevent pushing on fdo directly to avoid conflict. That change will also allow full replication from gerrit to fdo Did you intend to prevent pushing for only listed repositories, or all under libreoffice/* ? yes + dev-tools which I forgot in that list Because website repo still active for mainly bugzilla assistant, update checker, and tinderbox IMHO. Only active repos... 'website' is marked as 'obsolete' so no, I did not pick it up Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] 4.0 Test week/marathon Re: [...-qa] 3.7 bug hunt party ?
Hi Joel, *, Joel Madero wrote (07-12-12 00:02) Is there any plan to make a wiki page or something about the event? Sure. Examples from some of the earlier events: http://wiki.__documentfoundation.org/QA/__BugHunting_Session_3.5.0.-1 http://wiki.documentfoundation.org/QA/BugHunting_Session_3.5.0.-1 http://wiki.__documentfoundation.org/QA/__BugHunting_Session_3.6.0 http://wiki.documentfoundation.org/QA/BugHunting_Session_3.6.0 Want me to do this? Here is the initial version. Feel free to work on! http://wiki.documentfoundation.org/QA/Test_Marathon_LibreOffice_4.0 -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Using config_xxx.h instead of -DHAVE_XXX
Hello, currently our build system adds -DHAVE_XXX options to the compile command line for various settings, which does not quite scale, and does not cause relevant files to rebuild, so the common practice nowadays is to use config.h file(s). The attached patches implement this change and add one new test (together with bringing OUStringBuffer::append(bool) in again). Unless somebody sees a problem with this, I'll push them soon. There are more such -D options that could be changed, although with some it'd be better be careful, e.g. OSL_DEBUG can't go there, because it can be overriden by command-line, and I'm not sure if adding #include config_global.h to sal/config.h would be really included everywhere where needed. -- Lubos Lunak l.lu...@suse.cz From d525797786b148c742cad298e91183732dc575ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= l.lu...@suse.cz Date: Fri, 7 Dec 2012 17:51:21 +0100 Subject: [PATCH 1/2] use config_xxx.h files instead of -DHAVE_XXX on the command line As the latter does not quite scale, and also source files depending on the setting/feature did not rebuild in case of a change. There are intentionally more config_xxx.h files (so autoheader from autotools is not used), so that a setting change does not force automatically a rebuild of everything. Running configure does not touch those config_xxx.h files that have not changed. There's config/README with a howto. Change-Id: I6d6e82050ff8faf5364ed246848b8401aca3e0e5 --- config/.gitignore |3 +++ config/README | 24 config/config_global.h.in | 14 config/config_telepathy.h.in |6 + config/config_vclplug.h.in | 15 configure.ac | 12 ++ connectivity/source/drivers/kab/KDEInit.h |2 ++ cui/source/options/optgdlg.cxx |2 ++ cui/source/options/optmemory.cxx |2 ++ desktop/source/app/app.cxx |2 ++ .../source/plugin/inc/plugin/unx/plugcon.hxx |2 ++ extensions/source/plugin/unx/npnapi.cxx|2 ++ extensions/source/plugin/unx/npwrap.cxx|2 ++ sal/inc/rtl/instance.hxx |2 ++ sal/inc/rtl/stringutils.hxx|2 ++ sc/source/ui/docshell/docsh.cxx|2 ++ sc/source/ui/inc/docsh.hxx |2 ++ sc/source/ui/view/cellsh3.cxx |2 ++ shell/inc/shell/kde_headers.h |2 ++ solenv/gbuild/gbuild.mk|6 - solenv/gbuild/platform/com_GCC_defs.mk | 10 +++- solenv/gbuild/platform/com_MSC_class.mk|1 + solenv/gbuild/platform/macosx.mk |6 - solenv/gbuild/platform/unxgcc.mk |6 - vcl/unx/kde/FPServiceInfo.hxx |2 ++ vcl/unx/kde/UnxFilePicker.cxx |2 ++ vcl/unx/kde/fpicker/kdecommandthread.cxx |2 ++ vcl/unx/kde/fpicker/kdecommandthread.hxx |2 ++ vcl/unx/kde/fpicker/kdefilepicker.cxx |2 ++ vcl/unx/kde/fpicker/kdefilepicker.hxx |2 ++ vcl/unx/kde/fpicker/kdefpmain.cxx |2 ++ vcl/unx/kde/fpicker/kdemodalityfilter.hxx |2 ++ vcl/unx/kde/kdedata.cxx|2 ++ vcl/unx/kde/salnativewidgets-kde.cxx |2 ++ 34 files changed, 124 insertions(+), 25 deletions(-) create mode 100644 config/.gitignore create mode 100644 config/README create mode 100644 config/config_global.h.in create mode 100644 config/config_telepathy.h.in create mode 100644 config/config_vclplug.h.in diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 000..325a7fd --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,3 @@ +config_global.h +config_vclplug.h +config_telepathy.h diff --git a/config/README b/config/README new file mode 100644 index 000..fd58b64 --- /dev/null +++ b/config/README @@ -0,0 +1,24 @@ +These are configuration files for various features as detected by configure. + +Include only those files you need (in order to reduce rebuilds when a setting changes). + +Settings here are only C/C++ #define directives, so they apply only to C/C++ source, +not to Makefiles. + + + +Adding a new setting: += + +- do AC_DEFINE(HAVE_FOO) in configure.ac when a setting should be set +- choose the proper config/config_xxx.h file to use +- if it is a global setting (such as availability of a compiler feature), +use config/config_global.h +- otherwise check if there is a matching config/config_hxx.h file +- if none matches, add a new one: +- add
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/doc/notxtfrm.cxx |2
sw/source/core/inc/cellfrm.hxx|2
sw/source/core/inc/flyfrm.hxx |2
sw/source/core/inc/frame.hxx |2
sw/source/core/inc/layfrm.hxx |2
sw/source/core/inc/notxtfrm.hxx |2
sw/source/core/inc/pagefrm.hxx|2
sw/source/core/inc/rootfrm.hxx|2
sw/source/core/inc/txtfrm.hxx |2
sw/source/core/layout/trvlfrm.cxx | 96 ++
sw/source/core/layout/unusedf.cxx |2
sw/source/core/text/frmcrsr.cxx |2
12 files changed, 77 insertions(+), 41 deletions(-)
New commits:
commit d0a4a025855d78cdce194885c4df024c499bade6
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Nov 23 17:51:16 2012 +0100
fdo#52182: Fixed click in frames located in header/footer
Using a distance to click to select the best object to select between
normal text and background object.
(cherry picked from commit e8fbe97900f13305b17015d9044993bde4adab36)
Conflicts:
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/inc/edtwin.hxx
Change-Id: Ib5b53161c7af2c16f4df379382f2e53fc6d8092b
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 83b2fa9..99a8ea4 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -598,7 +598,7 @@ sal_Bool SwNoTxtFrm::GetCharRect( SwRect rRect, const
SwPosition rPos,
sal_Bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point ,
- SwCrsrMoveState* ) const
+ SwCrsrMoveState*, bool ) const
{
SwCntntNode* pCNd = (SwCntntNode*)GetNode();
pPos-nNode = *pCNd;
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 0bc62ae..958806e 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -48,7 +48,7 @@ public:
SwCellFrm( const SwTableBox , SwFrm*, bool bInsertContent = true );
~SwCellFrm();
-virtual sal_Bool GetCrsrOfst( SwPosition *, Point, SwCrsrMoveState* = 0 )
const;
+virtual sal_Bool GetCrsrOfst( SwPosition *, Point, SwCrsrMoveState* = 0,
bool bTestBackground = false ) const;
virtual void Paint( SwRect const,
SwPrintData const*const pPrintData = NULL ) const;
virtual void CheckDirection( sal_Bool bVert );
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 170064e..635451b 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -163,7 +163,7 @@ public:
SwPrintData const*const pPrintData = NULL ) const;
virtual Size ChgSize( const Size aNewSize );
virtual sal_Bool GetCrsrOfst( SwPosition *, Point,
- SwCrsrMoveState* = 0 ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground =
false ) const;
virtual void CheckDirection( sal_Bool bVert );
virtual void Cut();
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 3812a29..15c34ef 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -785,7 +785,7 @@ public:
virtual boolFillSelection( SwSelectionList rList, const SwRect rRect
) const;
virtual sal_BoolGetCrsrOfst( SwPosition *, Point,
- SwCrsrMoveState* = 0 ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground =
false ) const;
virtual sal_BoolGetCharRect( SwRect , const SwPosition,
SwCrsrMoveState* = 0 ) const;
virtual void Paint( SwRect const,
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 4c4e4e6..a8d4bc4 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -92,7 +92,7 @@ public:
virtual boolFillSelection( SwSelectionList rList, const SwRect rRect
) const;
virtual sal_Bool GetCrsrOfst( SwPosition *, Point,
- SwCrsrMoveState* = 0 ) const;
+ SwCrsrMoveState* = 0, bool bTestBackground =
false ) const;
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 17494b0..f8c1033 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -61,7 +61,7 @@ public:
virtual sal_Bool GetCharRect( SwRect , const SwPosition,
SwCrsrMoveState* = 0) const;
sal_Bool GetCrsrOfst(SwPosition* pPos, Point aPoint,
- SwCrsrMoveState* = 0) const;
+ SwCrsrMoveState* = 0, bool bTestBackground = false) const;
const Size GetGrfSize() const { return GetSize(); }
void GetGrfArea( SwRect rRect, SwRect * = 0, sal_Bool bMirror = sal_True
) const;
Re: Using config_xxx.h instead of -DHAVE_XXX
On Fri, Dec 7, 2012 at 11:42 AM, Lubos Lunak l.lu...@suse.cz wrote: There are more such -D options that could be changed, although with some it'd be better be careful, e.g. OSL_DEBUG can't go there, because it can be overriden by command-line, That is a case of addinf a guard in config.h #ifndef HAVE_FOO #define HAVE_FOO 0|1 #endif and always use these HAVE_xx with #if HAVE_ #if !HAVE_ rather than #ifdef HAVE_ #ifndef HAVE_ and I'm not sure if adding #include config_global.h to sal/config.h would be really included everywhere where needed. One remark... can we generate these in $WORKDIR like $WORKDIR/inc/config/* or something to that effect and have #include config/vckplug.h rather than include config_vclplug.h ? and we could also mandate that every source need to include #include config/lo.h or some some other thoroughly bikesheded name which would in turn include the global config, sal/config and other fundamental includes Norbert Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] migrate 'Insert Caption' dialog to .ui file
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1266 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/1266/1 migrate 'Insert Caption' dialog to .ui file Change-Id: I490c8057f1263f12f50b59c97ca9807138daab5d --- M sw/UI_swriter.mk M sw/inc/globals.hrc M sw/source/ui/app/app.src M sw/source/ui/config/optload.cxx M sw/source/ui/frmdlg/cption.cxx M sw/source/ui/frmdlg/cption.hrc M sw/source/ui/frmdlg/cption.src M sw/source/ui/inc/cption.hxx M sw/source/ui/inc/optload.hxx A sw/uiconfig/swriter/ui/insertcaption.ui 10 files changed, 560 insertions(+), 376 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1266 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I490c8057f1263f12f50b59c97ca9807138daab5d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e56c274f815a9b0cc55489537fad8c59273d2c94 Author: Andras Timar ati...@suse.com Date: Fri Dec 7 19:27:01 2012 +0100 Updated core Project: help 6ff9e113ec347757b3f5c91836c55902bd0e0ac9 fix empty extended tip diff --git a/helpcontent2 b/helpcontent2 index 22de25a..6ff9e11 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 22de25aee5060ad81e2c37d3012eb0eab509614e +Subproject commit 6ff9e113ec347757b3f5c91836c55902bd0e0ac9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/swriter/01/04120100.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6ff9e113ec347757b3f5c91836c55902bd0e0ac9 Author: Andras Timar ati...@suse.com Date: Fri Dec 7 19:27:01 2012 +0100 fix empty extended tip Change-Id: Ic74f10f8f2f06df7152e938698364010d1d25c5f diff --git a/source/text/swriter/01/04120100.xhp b/source/text/swriter/01/04120100.xhp index 9346b41..7504441 100644 --- a/source/text/swriter/01/04120100.xhp +++ b/source/text/swriter/01/04120100.xhp @@ -75,7 +75,7 @@ paragraph role=paragraph id=par_id3151248 xml-lang=en-US l10n=U oldref=25ahelp hid=modules/swriter/ui/indexentry/mainentrycbMakes the selected text the main entry in an alphabetical index./ahelp $[officename] displays the page number of the main entry in a different format than the other entries in the index./paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/indexentry/levelnf id=bm_id3147092 localize=false/ paragraph role=heading id=hd_id3149821 xml-lang=en-US level=3 l10n=U oldref=13Level/paragraph -paragraph role=paragraph id=par_id3147098 xml-lang=en-US l10n=U oldref=14Entries using the paragraph format Heading X (X = 1-10) can be automatically added to the table of contents. The level of the entry in the index corresponds to the outline level of the heading style.ahelp hid=modules/swriter/ui/indexentry/levelnf/ahelp/paragraph +paragraph role=paragraph id=par_id3147098 xml-lang=en-US l10n=U oldref=14ahelp hid=modules/swriter/ui/indexentry/levelnfEntries using the paragraph format Heading X (X = 1-10) can be automatically added to the table of contents. The level of the entry in the index corresponds to the outline level of the heading style./ahelp/paragraph paragraph role=note id=par_id3149175 xml-lang=en-US l10n=U oldref=16This option is available only for table of contents and user-defined index entries./paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/indexentry/applytoallcb id=bm_id3145777 localize=false/ paragraph role=heading id=hd_id3156278 xml-lang=en-US level=3 l10n=U oldref=19Apply to all similar texts/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1064aa51ff017ce3e7bbed1d3e7127b8449d441 Author: Andras Timar ati...@suse.com Date: Fri Dec 7 19:27:01 2012 +0100 Updated core Project: help ed658fe4ef7900078255a02f8410ef2e51a76189 fix empty extended tip diff --git a/helpcontent2 b/helpcontent2 index a9273e3..ed658fe 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a9273e373f90f2ccace22466202bf6d72813baf9 +Subproject commit ed658fe4ef7900078255a02f8410ef2e51a76189 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/text
source/text/swriter/01/04120100.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ed658fe4ef7900078255a02f8410ef2e51a76189 Author: Andras Timar ati...@suse.com Date: Fri Dec 7 19:27:01 2012 +0100 fix empty extended tip Change-Id: Ic74f10f8f2f06df7152e938698364010d1d25c5f diff --git a/source/text/swriter/01/04120100.xhp b/source/text/swriter/01/04120100.xhp index 9346b41..7504441 100644 --- a/source/text/swriter/01/04120100.xhp +++ b/source/text/swriter/01/04120100.xhp @@ -75,7 +75,7 @@ paragraph role=paragraph id=par_id3151248 xml-lang=en-US l10n=U oldref=25ahelp hid=modules/swriter/ui/indexentry/mainentrycbMakes the selected text the main entry in an alphabetical index./ahelp $[officename] displays the page number of the main entry in a different format than the other entries in the index./paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/indexentry/levelnf id=bm_id3147092 localize=false/ paragraph role=heading id=hd_id3149821 xml-lang=en-US level=3 l10n=U oldref=13Level/paragraph -paragraph role=paragraph id=par_id3147098 xml-lang=en-US l10n=U oldref=14Entries using the paragraph format Heading X (X = 1-10) can be automatically added to the table of contents. The level of the entry in the index corresponds to the outline level of the heading style.ahelp hid=modules/swriter/ui/indexentry/levelnf/ahelp/paragraph +paragraph role=paragraph id=par_id3147098 xml-lang=en-US l10n=U oldref=14ahelp hid=modules/swriter/ui/indexentry/levelnfEntries using the paragraph format Heading X (X = 1-10) can be automatically added to the table of contents. The level of the entry in the index corresponds to the outline level of the heading style./ahelp/paragraph paragraph role=note id=par_id3149175 xml-lang=en-US l10n=U oldref=16This option is available only for table of contents and user-defined index entries./paragraph bookmark xml-lang=en-US branch=hid/modules/swriter/ui/indexentry/applytoallcb id=bm_id3145777 localize=false/ paragraph role=heading id=hd_id3156278 xml-lang=en-US level=3 l10n=U oldref=19Apply to all similar texts/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - config/config_global.h.in config/config_telepathy.h.in config/config_vclplug.h.in config/.gitignore config/README configure.ac connectivity/source cui/source deskt
Makefile.top|2 -
config/.gitignore |3 +
config/README | 24
config/config_global.h.in | 15 +++
config/config_telepathy.h.in|6 +++
config/config_vclplug.h.in | 15 +++
configure.ac| 40
connectivity/source/drivers/kab/KDEInit.h |2 +
cui/source/options/optgdlg.cxx |2 +
cui/source/options/optmemory.cxx|2 +
desktop/source/app/app.cxx |2 +
extensions/source/plugin/inc/plugin/unx/plugcon.hxx |2 +
extensions/source/plugin/unx/npnapi.cxx |2 +
extensions/source/plugin/unx/npwrap.cxx |2 +
sal/inc/rtl/instance.hxx|2 +
sal/inc/rtl/stringutils.hxx | 25
sal/inc/rtl/ustrbuf.hxx | 40
sc/source/ui/docshell/docsh.cxx |2 +
sc/source/ui/inc/docsh.hxx |2 +
sc/source/ui/view/cellsh3.cxx |2 +
shell/inc/shell/kde_headers.h |2 +
solenv/gbuild/gbuild.mk |6 ---
solenv/gbuild/platform/com_GCC_defs.mk | 10 +
solenv/gbuild/platform/com_MSC_class.mk |1
solenv/gbuild/platform/macosx.mk|6 ---
solenv/gbuild/platform/unxgcc.mk|6 ---
vcl/unx/kde/FPServiceInfo.hxx |2 +
vcl/unx/kde/UnxFilePicker.cxx |2 +
vcl/unx/kde/fpicker/kdecommandthread.cxx|2 +
vcl/unx/kde/fpicker/kdecommandthread.hxx|2 +
vcl/unx/kde/fpicker/kdefilepicker.cxx |2 +
vcl/unx/kde/fpicker/kdefilepicker.hxx |2 +
vcl/unx/kde/fpicker/kdefpmain.cxx |2 +
vcl/unx/kde/fpicker/kdemodalityfilter.hxx |2 +
vcl/unx/kde/kdedata.cxx |2 +
vcl/unx/kde/salnativewidgets-kde.cxx|2 +
36 files changed, 216 insertions(+), 27 deletions(-)
New commits:
commit a72bee7786d370b95416cc5a5bee70dbeca643f0
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Dec 7 19:48:50 2012 +0100
avoid annoying warning about missing file included from Makefile.top
Change-Id: I669273a90a0ed62256c2b0a7f4ea74c522919ef5
diff --git a/Makefile.top b/Makefile.top
index 42e134b..0ff1b96 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -36,7 +36,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard
*/prj/dmake) $(SRCDI
for m in */prj/dmake; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@
echo $@
-include $(WORKDIR)/modules.mk
+-include $(WORKDIR)/modules.mk
include $(SRCDIR)/solenv/gbuild/Output.mk
$(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call
gb_Output_warn,The following modules claim to be both dmake and gbuild:
$(filter $(gbuild_modules),$(dmake_modules)
commit 49a9d370e6598284c0a337d0f4f7ec329187de53
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Dec 7 18:13:31 2012 +0100
add rtl::OUStringBuffer::append(bool)
The same as 563fa900ba22bf83dfa58e67807ed0337f810576 , but this
time with extra care to not break anything with pointer-bool conversions.
Change-Id: Ifcea840e96da0fbfcf92b54141fb8ef9c5eb94ff
diff --git a/config/config_global.h.in b/config/config_global.h.in
index a9eb54f..77980d4 100644
--- a/config/config_global.h.in
+++ b/config/config_global.h.in
@@ -9,6 +9,7 @@ Any change in this header will cause a rebuild of almost
everything.
*/
+#undef HAVE_CXX11_DELETE
#undef HAVE_GCC_BUILTIN_ATOMIC
#undef HAVE_SFINAE_ANONYMOUS_BROKEN
#undef HAVE_THREADSAFE_STATICS
diff --git a/configure.ac b/configure.ac
index 9a0d449..5cc0d71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5705,6 +5705,34 @@ AC_SUBST(HAVE_GCC_NO_LONG_DOUBLE)
AC_SUBST(HAVE_GCC_AVX)
AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
+dnl ==
+dnl Check for C++11 = delete support
+dnl ==
+
+AC_MSG_CHECKING([whether $CXX supports C++11 = delete syntax])
+if test $HAVE_CXX0X = TRUE; then
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS -std=gnu++0x
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+struct A
+{
+void test() = delete;
+};
+]])],[HAVE_CXX11_DELETE=TRUE],[])
+
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+if test $HAVE_CXX11_DELETE = TRUE; then
+AC_MSG_RESULT([yes])
+AC_DEFINE([HAVE_CXX11_DELETE])
+else
+AC_MSG_RESULT([no])
+fi
+else
+AC_MSG_RESULT([no (C++11 disabled)])
+fi
+
dnl
Re: Using config_xxx.h instead of -DHAVE_XXX
On Friday 07 of December 2012, Norbert Thiebaud wrote: On Fri, Dec 7, 2012 at 11:42 AM, Lubos Lunak l.lu...@suse.cz wrote: There are more such -D options that could be changed, although with some it'd be better be careful, e.g. OSL_DEBUG can't go there, because it can be overriden by command-line, That is a case of addinf a guard in config.h #ifndef HAVE_FOO #define HAVE_FOO 0|1 #endif and always use these HAVE_xx with #if HAVE_ #if !HAVE_ rather than #ifdef HAVE_ #ifndef HAVE_ I don't know what you are referring to exactly with this. It's true that it's safer to use #if HAVE rather than #ifdef, but I didn't want to mix it together with this change. It can be done independently. Or if this was about OSL_DEBUG, I except it can be probably moved there, but I again didn't want to complicate this. and I'm not sure if adding #include config_global.h to sal/config.h would be really included everywhere where needed. One remark... can we generate these in $WORKDIR like $WORKDIR/inc/config/* or something to that effect and have #include config/vckplug.h rather than include config_vclplug.h ? They can't be in $WORKDIR, because it's like with config_host.mk - that one also survives make clean. and we could also mandate that every source need to include #include config/lo.h or some some other thoroughly bikesheded name which would in turn include the global config, sal/config and other fundamental includes I seem to remember somebody has already said that this file is in fact sal/config.h , I'd just prefer to hear to for sure instead of seeming to remember it. In other news, I've already committed the two patches by mistake, so I'll keep them in unless somebody finds out something wrong with them. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cppunit/disable-dynloading.patch
cppunit/disable-dynloading.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 135fbb750e6cf9438f408499b4cf7034c6e5918e Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Dec 7 20:05:25 2012 +0100 get cppunit/disable-dynloading.patch to apply diff --git a/cppunit/disable-dynloading.patch b/cppunit/disable-dynloading.patch index 14b6d29..a9aa37f 100644 --- a/cppunit/disable-dynloading.patch +++ b/cppunit/disable-dynloading.patch @@ -1,4 +1,4 @@ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h +--- build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h +++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h @@ -106,7 +106,9 @@ * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: random number generators for calc
Small problems: - compiler warnings from within boost We need to patch them out otherwise the Werror build will fail. It seems that these warnings are also fixed upstream. This really confuses me. The warnings I'm getting are of the form ...boost/random/binomial_distribution.hpp:47:5: warning: declaration of 'p' shadows a member of 'this' [-Wshadow] I'm also getting similar warnings even with boost 1.52, however only if boost resides in a non-standard directory. Linking boost to /usr/local/include and using -I/usr/local/include makes all the -Wshadow warnings disappear. Don't know if you can confirm this but this is beyond me: # ln -s .../core/solver/unxlngx6.pro/inc/external/boost /usr/local/include # ln -s .../core/solver/unxlngx6.pro/inc/external/boost /tmp/include $ cd .../core/sc/source/core/tool $ g++ -Wall -Wshadow -c random.cxx -I/tmp/include ... [warnings] ... $ g++ -Wall -Wshadow -c random.cxx -I/usr/local/include [no warning] Just a few more comments about the patch. We need to ifdef all unused methods in random.[ch]xx otherwise they will be removed in nearly no time. We are removing unused functions to clean the codebase. Please also don't leave old code commented, we have git for code history so we don't need to keep all code as comments. Before I'll push the change with these modifications I'll check with a big file containing a lot of RANDOM functions to check that we are not introducing a performance regression. Yes, thanks, that makes sense. I hope it speeds up slightly... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfcharsets.cxx|1 + writerfilter/source/rtftok/rtfcharsets.hxx|1 + writerfilter/source/rtftok/rtfcontrolwords.cxx|1 + writerfilter/source/rtftok/rtfcontrolwords.hxx|1 + writerfilter/source/rtftok/rtfdocumentfactory.cxx |1 + writerfilter/source/rtftok/rtfdocumentimpl.hxx|1 + writerfilter/source/rtftok/rtffly.hxx |1 + writerfilter/source/rtftok/rtfreferenceproperties.cxx |1 + writerfilter/source/rtftok/rtfreferenceproperties.hxx |1 + writerfilter/source/rtftok/rtfreferencetable.cxx |1 + writerfilter/source/rtftok/rtfreferencetable.hxx |1 + writerfilter/source/rtftok/rtfsdrimport.cxx |1 + writerfilter/source/rtftok/rtfsdrimport.hxx |1 + writerfilter/source/rtftok/rtfskipdestination.cxx |1 + writerfilter/source/rtftok/rtfskipdestination.hxx |1 + writerfilter/source/rtftok/rtfsprm.cxx|1 - writerfilter/source/rtftok/rtftokenizer.cxx |1 + writerfilter/source/rtftok/rtftokenizer.hxx |1 + writerfilter/source/rtftok/rtfvalue.cxx |1 + writerfilter/source/rtftok/rtfvalue.hxx |1 + 20 files changed, 19 insertions(+), 1 deletion(-) New commits: commit 74471fbf16bb8a132025c280b2bf0535aa202ef9 Author: Michael Meeks michael.me...@suse.com Date: Fri Dec 7 20:10:30 2012 + remove bogus assert and add emacs modelines. Change-Id: If4b6478ab67211e00c52fb9b17189f6f054b3482 diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx b/writerfilter/source/rtftok/rtfcharsets.cxx index 360db9e..149c1db 100644 --- a/writerfilter/source/rtftok/rtfcharsets.cxx +++ b/writerfilter/source/rtftok/rtfcharsets.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx b/writerfilter/source/rtftok/rtfcharsets.hxx index e4f824d..f47c797 100644 --- a/writerfilter/source/rtftok/rtfcharsets.hxx +++ b/writerfilter/source/rtftok/rtfcharsets.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx index 0952805..9ecf9be 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.cxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx index 1088982..4c33c9e 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.hxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/writerfilter/source/rtftok/rtfdocumentfactory.cxx index 8e8868b..f9e53cc 100644 --- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx +++ b/writerfilter/source/rtftok/rtfdocumentfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index fad32e6..1df8de1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index 8922524..9e2141c 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx index 50f76e3..63ee665 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index 369590b..85c3c67 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++;
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - writerfilter/source
writerfilter/source/rtftok/rtfcharsets.cxx|1 writerfilter/source/rtftok/rtfcharsets.hxx|1 writerfilter/source/rtftok/rtfcontrolwords.cxx|1 writerfilter/source/rtftok/rtfcontrolwords.hxx|1 writerfilter/source/rtftok/rtfdocumentfactory.cxx |1 writerfilter/source/rtftok/rtfdocumentimpl.cxx|7 - writerfilter/source/rtftok/rtfdocumentimpl.hxx|1 writerfilter/source/rtftok/rtffly.hxx |1 writerfilter/source/rtftok/rtfreferenceproperties.cxx |1 writerfilter/source/rtftok/rtfreferenceproperties.hxx |1 writerfilter/source/rtftok/rtfreferencetable.cxx |1 writerfilter/source/rtftok/rtfreferencetable.hxx |1 writerfilter/source/rtftok/rtfsdrimport.cxx |1 writerfilter/source/rtftok/rtfsdrimport.hxx |1 writerfilter/source/rtftok/rtfskipdestination.cxx |1 writerfilter/source/rtftok/rtfskipdestination.hxx |1 writerfilter/source/rtftok/rtfsprm.cxx| 57 +++ writerfilter/source/rtftok/rtfsprm.hxx| 67 -- writerfilter/source/rtftok/rtftokenizer.cxx |1 writerfilter/source/rtftok/rtftokenizer.hxx |1 writerfilter/source/rtftok/rtfvalue.cxx |1 writerfilter/source/rtftok/rtfvalue.hxx |1 22 files changed, 110 insertions(+), 40 deletions(-) New commits: commit 81145625e30596495f22823921432957e0c73aea Author: Michael Meeks michael.me...@suse.com Date: Fri Dec 7 20:10:30 2012 + remove bogus assert and add emacs modelines. Change-Id: If4b6478ab67211e00c52fb9b17189f6f054b3482 diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx b/writerfilter/source/rtftok/rtfcharsets.cxx index 360db9e..149c1db 100644 --- a/writerfilter/source/rtftok/rtfcharsets.cxx +++ b/writerfilter/source/rtftok/rtfcharsets.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx b/writerfilter/source/rtftok/rtfcharsets.hxx index e4f824d..f47c797 100644 --- a/writerfilter/source/rtftok/rtfcharsets.hxx +++ b/writerfilter/source/rtftok/rtfcharsets.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx index 0952805..9ecf9be 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.cxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx index 1088982..4c33c9e 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.hxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/writerfilter/source/rtftok/rtfdocumentfactory.cxx index 8e8868b..f9e53cc 100644 --- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx +++ b/writerfilter/source/rtftok/rtfdocumentfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index fad32e6..1df8de1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index 8922524..9e2141c 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx index 50f76e3..63ee665 100644 --- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx +++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/writerfilter/source/rtftok/rtfreferenceproperties.hxx index 369590b..85c3c67 100644 ---
[Libreoffice-commits] .: boost/boost.7774.warnings.patch.1 boost/UnpackedTarball_boost.mk
boost/UnpackedTarball_boost.mk|2 ++
boost/boost.7774.warnings.patch.1 | 34 ++
2 files changed, 36 insertions(+)
New commits:
commit 632cdffd08df8cdaeba47c6c42c7f718aaf9e751
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 7 22:01:03 2012 +0100
fix Wshadow warnings in boost random
upstreamed as https://svn.boost.org/trac/boost/ticket/7774
Change-Id: I73d25ff16733a0b5c61250fdd98bee13b9fb7173
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 8035da2..4db9aef 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -30,6 +30,8 @@ boost_patches += boost.4100.warnings.patch
boost_patches += boost.4510.warnings.patch
#https://svn.boost.org/trac/boost/ticket/6940
boost_patches += boost.6940.glibc.patch
+#https://svn.boost.org/trac/boost/ticket/7774
+boost_patches += boost.7774.warnings.patch.1
boost_patches += boost.windows.patch
boost_patches += boost.vc2012.patch
diff --git a/boost/boost.7774.warnings.patch.1
b/boost/boost.7774.warnings.patch.1
new file mode 100644
index 000..60c4f05
--- /dev/null
+++ b/boost/boost.7774.warnings.patch.1
@@ -0,0 +1,34 @@
+diff -ur boost.org/boost/random/binomial_distribution.hpp
boost/boost/random/binomial_distribution.hpp
+--- boost.org/boost/random/binomial_distribution.hpp 2012-12-07
21:17:45.789067382 +0100
boost/boost/random/binomial_distribution.hpp 2012-12-07
21:42:39.915034045 +0100
+@@ -42,12 +42,12 @@
+*
+* Requires: t =0 0 = p = 1
+*/
+- explicit binomial_distribution(IntType t = 1,
+- const RealType p = RealType(0.5))
+-: _bernoulli(p), _t(t)
++ explicit binomial_distribution(IntType t_arg = 1,
++ const RealType p_arg = RealType(0.5))
++: _bernoulli(p_arg), _t(t_arg)
+ {
+ assert(_t = 0);
+-assert(RealType(0) = p p = RealType(1));
++assert(RealType(0) = p_arg p_arg = RealType(1));
+ }
+
+ // compiler-generated copy ctor and assignment operator are fine
+diff -ur boost.org/boost/random/geometric_distribution.hpp
boost/boost/random/geometric_distribution.hpp
+--- boost.org/boost/random/geometric_distribution.hpp 2012-12-07
21:17:45.789067382 +0100
boost/boost/random/geometric_distribution.hpp 2012-12-07
21:41:34.970035494 +0100
+@@ -50,8 +50,8 @@
+*
+* Requires: 0 p 1
+*/
+- explicit geometric_distribution(const RealType p = RealType(0.5))
+-: _p(p)
++ explicit geometric_distribution(const RealType p_arg = RealType(0.5))
++: _p(p_arg)
+ {
+ assert(RealType(0) _p _p RealType(1));
+ init();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: random number generators for calc
Hey 2012/12/7 tino ttk...@gmail.com: Small problems: - compiler warnings from within boost We need to patch them out otherwise the Werror build will fail. It seems that these warnings are also fixed upstream. This really confuses me. The warnings I'm getting are of the form ...boost/random/binomial_distribution.hpp:47:5: warning: declaration of 'p' shadows a member of 'this' [-Wshadow] I'm also getting similar warnings even with boost 1.52, however only if boost resides in a non-standard directory. Linking boost to /usr/local/include and using -I/usr/local/include makes all the -Wshadow warnings disappear. Don't know if you can confirm this but this is beyond me: # ln -s .../core/solver/unxlngx6.pro/inc/external/boost /usr/local/include # ln -s .../core/solver/unxlngx6.pro/inc/external/boost /tmp/include $ cd .../core/sc/source/core/tool $ g++ -Wall -Wshadow -c random.cxx -I/tmp/include ... [warnings] ... $ g++ -Wall -Wshadow -c random.cxx -I/usr/local/include [no warning] It is actually only partly fixed upstream. I opened boost#7774 for the missing change and fixed it for our internal boost with http://cgit.freedesktop.org/libreoffice/core/commit/?id=632cdffd08df8cdaeba47c6c42c7f718aaf9e751 I'll have a look at the remaining parts now. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/ado/AColumn.cxx|4 +---
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |2 --
connectivity/source/drivers/ado/AGroup.cxx |3 +--
connectivity/source/drivers/ado/Awrapado.cxx |3 +--
connectivity/source/drivers/postgresql/pq_xcolumns.cxx |4 +---
5 files changed, 4 insertions(+), 12 deletions(-)
New commits:
commit a99bf813c0079c26f2a2c940c3db8d8597e3047f
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 7 22:18:49 2012 +0100
Some cppcheck cleaning
Change-Id: I5e8c768981dc6b8029bdc7eb8887562ccc18a5e2
diff --git a/connectivity/source/drivers/ado/AColumn.cxx
b/connectivity/source/drivers/ado/AColumn.cxx
index 4c4e4f2..ab50f2f 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -39,10 +39,8 @@ using namespace com::sun::star::sdbc;
void WpADOColumn::Create()
{
-HRESULT hr = -1;
-
_ADOColumn* pColumn = NULL;
-hr = CoCreateInstance(ADOS::CLSID_ADOCOLUMN_25,
+HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOCOLUMN_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOCOLUMN_25,
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 61ec5d5..ed48af3 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -728,7 +728,6 @@ sal_Bool
ODatabaseMetaDataResultSet::convertFastPropertyValue(
case PROPERTY_ID_RESULTSETCONCURRENCY:
case PROPERTY_ID_RESULTSETTYPE:
throw ::com::sun::star::lang::IllegalArgumentException();
-break;
case PROPERTY_ID_FETCHDIRECTION:
return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue,
rValue, getFetchDirection());
case PROPERTY_ID_FETCHSIZE:
@@ -753,7 +752,6 @@ void
ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast(
case PROPERTY_ID_FETCHDIRECTION:
case PROPERTY_ID_FETCHSIZE:
throw Exception();
-break;
default:
OSL_FAIL(setFastPropertyValue_NoBroadcast: Illegal handle
value!);
}
diff --git a/connectivity/source/drivers/ado/AGroup.cxx
b/connectivity/source/drivers/ado/AGroup.cxx
index a7192db..ea54a1f 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -37,9 +37,8 @@ using namespace com::sun::star::sdbcx;
// -
void WpADOGroup::Create()
{
-HRESULT hr = -1;
ADOGroup* pGroup = NULL;
-hr = CoCreateInstance(ADOS::CLSID_ADOGROUP_25,
+HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOGROUP_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOGROUP_25,
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx
b/connectivity/source/drivers/ado/Awrapado.cxx
index 0853585..b0cb037 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -36,9 +36,8 @@ using namespace connectivity::ado;
void WpADOCatalog::Create()
{
-HRESULT hr = -1;
_ADOCatalog* pCommand;
-hr = CoCreateInstance(ADOS::CLSID_ADOCATALOG_25,
+HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOCATALOG_25,
NULL,
CLSCTX_INPROC_SERVER,
ADOS::IID_ADOCATALOG_25,
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 7d34de2..e0bd4ad 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -119,9 +119,7 @@ static Any isCurrency( const rtl::OUString typeName )
static Any isAutoIncrement( const rtl::OUString defaultValue )
{
-sal_Bool ret = sal_False;
-
-ret = defaultValue.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( nextval( ) );
+sal_Bool ret = defaultValue.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(
nextval( ) );
// printf( %s %d\n,
// OUStringToOString(defaultValue,
RTL_TEXTENCODING_ASCII_US).getStr(),
// ret );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: random number generators for calc
Hi, On Friday, 2012-12-07 17:04:52 +0100, Markus Mohrhard wrote: Small problems: - compiler warnings from within boost We need to patch them out otherwise the Werror build will fail. It seems that these warnings are also fixed upstream. I'd rather prefer if we did not patch external modules for Werror but instead use the warnings guard header mechanism, for example see i18npool/inc/warnings_guard_unicode_calendar.h Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp6FFYJNfMNt.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cppunit/ExternalPackage_cppunit.mk
cppunit/ExternalPackage_cppunit.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 76c19172de03a1fd0cbf3febc6a68a7138b7b0c4 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Dec 7 16:03:21 2012 -0600 missing delivery in cppunit on Mac Change-Id: I45e608da450b34c516974cfa1bf6267f5d6ddd29 diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk index 4c430e8..bfcfdc0 100644 --- a/cppunit/ExternalPackage_cppunit.mk +++ b/cppunit/ExternalPackage_cppunit.mk @@ -24,6 +24,7 @@ else $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester)) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dylib,src/cppunit/.libs/libcppunit.dylib)) else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a)) else ifeq ($(OS),OPENBSD) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] - correct variable-names
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1267 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1267/1 - correct variable-names Change-Id: I2c0106d18586201f8c0fa444652ecefb493d61bf --- M sd/source/ui/toolpanel/controls/MasterPageContainer.cxx M sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx 2 files changed, 8 insertions(+), 8 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1267 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c0106d18586201f8c0fa444652ecefb493d61bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57259, which changed state. Bug 57259 Summary: UI: Master pages styles change view to Default instead of being applied https://bugs.freedesktop.org/show_bug.cgi?id=57259 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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: Using config_xxx.h instead of -DHAVE_XXX
On Fri, Dec 7, 2012 at 12:56 PM, Lubos Lunak l.lu...@suse.cz wrote: On Friday 07 of December 2012, Norbert Thiebaud wrote: On Fri, Dec 7, 2012 at 11:42 AM, Lubos Lunak l.lu...@suse.cz wrote: There are more such -D options that could be changed, although with some it'd be better be careful, e.g. OSL_DEBUG can't go there, because it can be overriden by command-line, That is a case of addinf a guard in config.h #ifndef HAVE_FOO #define HAVE_FOO 0|1 #endif and always use these HAVE_xx with #if HAVE_ #if !HAVE_ rather than #ifdef HAVE_ #ifndef HAVE_ I don't know what you are referring to exactly with this. I'm refering to the ability to override from the environment a define in config.h if it based on def/undef you can override a def if it is based on 0/1 then you can override by defining stuff in the environment (using CXXFLAGS for instance) and I'm not sure if adding #include config_global.h to sal/config.h would be really included everywhere where needed. One remark... can we generate these in $WORKDIR like $WORKDIR/inc/config/* or something to that effect and have #include config/vckplug.h rather than include config_vclplug.h ? They can't be in $WORKDIR, because it's like with config_host.mk - that one also survives make clean. humm. true... I'm just concened about puting stuff in the source tree... but we will cross that bridge when we get there (the ability to build with a read-only source tree) and we could also mandate that every source need to include #include config/lo.h or some some other thoroughly bikesheded name which would in turn include the global config, sal/config and other fundamental includes I seem to remember somebody has already said that this file is in fact sal/config.h , I'd just prefer to hear to for sure instead of seeming to remember it. That _cannot_ be sal/config.h sal/config is part of the URE.. it is published, it is very often omitted and only included indrectly, and it cannot be used to group commonly used include like ustring.hxx. and certainly cannot be used to server LibreOffice centric hack purpose. In other news, I've already committed the two patches by mistake, so I'll keep them in unless somebody finds out something wrong with them. oh well...I still don't like to pollution of the build root with an ever growing series of config_foo.h file... that will need to be added to .gitignore... if they were in a config directory that would be much neater and much easier to do a safe distro-clean Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2
Hi Winfried, On Thursday, 2012-12-06 13:08:37 +0100, Winfried Donkers wrote: -Oorspronkelijk bericht- Van: Winfried Donkers So I followed your suggestion to work along the lines of ScIfJump/ocIf. These last 2 weeks I have not been able to get that working properly. To finally find out what goes wrong, I copied the contents of SCIfJump() into ScIfError(), made ocIfError do the same as ocIf (except in lotus/excel filter files) and gave IFERROR() 3 arguments (just as IF()). It still doesn't work: IFERROR(X;Y;Z) always returns Y, regardless of the value of X. That is, if X produces an error (or Y, or Z), the error is returned. What am I missing/messing up? Could it be that you didn't implement the special handling in the compiler and tokens? Grep for ocIf in formula/source/core/api/token.cxx formula/source/core/api/FormulaCompiler.cxx sc/source/core/tool/token.cxx sc/source/core/tool/interpr4.cxx For all occurrences that might need attention issue the command git grep ocIf formula sc in $SRCDIR, e.g. for completeness at the end there should also be an entry in sc/source/core/tool/parclass.cxx Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpJ11DUu25bF.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Makefile.top
Makefile.top |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e9b21193ed395061b155955e5098f69af92b4fc0
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Dec 7 23:41:19 2012 +0100
remove config_xxx.h files in distclean
Change-Id: I40ff08ccd2c887c632672631b1df53970112dca8
diff --git a/Makefile.top b/Makefile.top
index 0ff1b96..6e7a18c 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -145,7 +145,7 @@ ifeq ($(BUILD_DMAKE),YES)
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
config.log config.status configure \
- config_host.mk.last config_host.mk.stamp warn
+ config_host.mk.last config_host.mk.stamp warn config/*.h
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Using config_xxx.h instead of -DHAVE_XXX
On Fri, Dec 07, 2012 at 04:23:36PM -0600, Norbert Thiebaud wrote: oh well...I still don't like to pollution of the build root with an ever growing series of config_foo.h file... that will need to be added to .gitignore... if they were in a config directory that would be much neater and much easier to do a safe distro-clean Yep, a config dir would be much better, for multiple reasons: - easier for .gitignore - easier for packagers (apt complains about changes to the source tree) - easier for a read-only source tree (that dir can e.g. be bind-mounted, a tmpfs etc) - easier to set as -I path to find the header - SRCDIR should never be in the include path -- it would lead to all kinds trouble wrt which header is chosen (the one from solver?, the one from SRCDIR? both will likely have the same relative path), leading to interesting dep-files, and possibly mysterious rebuild issues Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Add document chooser and quit to DocumentLoader in andro...
Naser Sharifi has abandoned this change. Change subject: Add document chooser and quit to DocumentLoader in android/experimental .. Patch Set 1: Abandoned Overlaps with existing code. -- To view, visit https://gerrit.libreoffice.org/1258 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I4d0e192b9fc7a3c5751f007cf99a9991bd70e719 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Naser Sharifi sharifina...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Naser Sharifi sharifina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/source/core/data/global.cxx |2 +
sc/source/core/inc/random.hxx| 29 +
sc/source/core/tool/interpr1.cxx |3 +-
sc/source/core/tool/random.cxx | 53 +++
5 files changed, 87 insertions(+), 1 deletion(-)
New commits:
commit 8450a99c744e9005f19173e4df35d65640bcf5c4
Author: tino ttk...@gmail.com
Date: Thu Dec 6 14:05:11 2012 +
fdo#33365 added wrapper for boost random, use that in RAND()
Change-Id: Iafc524d12c76423f74dc16b42595e52fbc5a1e54
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 348300f..10918e4 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -213,6 +213,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/progress \
sc/source/core/tool/queryentry \
sc/source/core/tool/queryparam \
+ sc/source/core/tool/random \
sc/source/core/tool/rangelst \
sc/source/core/tool/rangenam \
sc/source/core/tool/rangeseq \
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 4e449c5..e18d241 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -75,6 +75,7 @@
#include sc.hrc
#include scmod.hxx
#include appoptio.hxx
+#include random.hxx
// ---
@@ -557,6 +558,7 @@ void ScGlobal::Init()
// names from the compiler.
ScParameterClassification::Init();
srand( (unsigned) time( NULL ) ); // Random Seed Init fuer
Interpreter
+sc::rng::seed( time( NULL ) ); // seed for libc rand() replacement
InitAddIns();
diff --git a/sc/source/core/inc/random.hxx b/sc/source/core/inc/random.hxx
new file mode 100644
index 000..a9f6c81
--- /dev/null
+++ b/sc/source/core/inc/random.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_RANDOM_HXX
+#define SC_RANDOM_HXX
+
+namespace sc
+{
+
+namespace rng
+{
+
+void seed(int i); // set initial seed (equivalent of libc srand())
+
+double uniform(); // uniform distribution in [0,1)
+
+} // namespace
+
+} // namespace
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 43a21eb..d382152 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -44,6 +44,7 @@
#include globstr.hrc
#include attrib.hxx
#include jumpmatrix.hxx
+#include random.hxx
#include comphelper/processfactory.hxx
#include comphelper/string.hxx
@@ -1711,7 +1712,7 @@ void ScInterpreter::ScPi()
void ScInterpreter::ScRandom()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScRandom
);
-PushDouble((double)rand() / ((double)RAND_MAX+1.0));
+PushDouble(sc::rng::uniform());
}
diff --git a/sc/source/core/tool/random.cxx b/sc/source/core/tool/random.cxx
new file mode 100644
index 000..a7fff67
--- /dev/null
+++ b/sc/source/core/tool/random.cxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Contributor(s):
+ * Copyright (C) 2012 Tino Kluge tino.kl...@hrz.tu-chemnitz.de
+ *
+ */
+
+#include boost/random.hpp
+
+// this is nothing but a simple wrapper around
+// the boost random generators
+
+namespace sc
+{
+namespace rng
+{
+
+// underlying random number generator
+// boost::mt19937 implements the Mersenne twister algorithm which
+// is fast and has good statistical properties, it produces integers
+// in the range of [0, 2^32-1] internally
+// memory requirement: 625*sizeof(uint32_t)
+// http://en.wikipedia.org/wiki/Mersenne_twister
+#define BOOST_RNG_ALGO boost::mt19937
+BOOST_RNG_ALGO global_rng;
+
+// initialises the state of the global random number generator
+// should only be called once at the start of the main programme
+// (note, a few boost::variate_generator (like normal) have their
+// own state which would need a reset as well to guarantee identical
+// sequence of numbers, e.g. via myrand.distribution().reset())
+void seed(int i)
+{
+global_rng.seed(i);
+}
+
+// uniform [0,1) or [a,b) distribution
+double uniform()
+{
+static boost::uniform_01BOOST_RNG_ALGO myrand(global_rng);
+return myrand();
+}
+
+} // namespace
+} // namespace
+
+/* vim:set shiftwidth=4 softtabstop=4
Re: random number generators for calc
Hey tino, Attached patch is just a simple wrapper around boost, to be used like sc::rng::seed() to replace libc srand() sc::rng::rand() to replace libc rand() I pushed this part of the patch. and a few more distributions. I did not push them. As soon as we have users for them it makes sense to add them. There is no good reason to add functions that might maybe used later. If we use them somewhere we can still use the patch for their implementation. I've also modified ScInterpreter::ScRandom() to simply call sc::rng::uniform() which should solve bug 33365. Pushed that without the old line. I've not modified RANDBETWEEN(a,b) yet but this could simply call sc::rng::uniform_int(a,b). Also, the rand in Basic could be changed in the future. Small problems: - compiler warnings from within boost - few asserts might need to be replaced The compiler warning is fixed. And here the link to the patch: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8450a99c744e9005f19173e4df35d65640bcf5c4 Thanks a lot for the patch. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
license statement
Hey Tino, seems like we have no license statement from you. Could you please send one to the Mailinglist? Something in the form of: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Thanks, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/qa sc/source
sc/inc/dpsave.hxx|2 +
sc/qa/unit/ucalc.cxx | 29 ++
sc/source/core/data/dpobject.cxx | 12 +-
sc/source/core/data/dpsave.cxx | 37 +
sc/source/ui/view/dbfunc3.cxx| 43 ++-
5 files changed, 86 insertions(+), 37 deletions(-)
New commits:
commit f421e804371670001bc5af25b8b66d67dfdb3261
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Dec 5 12:53:03 2012 -0500
fdo#57497: Remove group table data when all group dimensions are gone.
Otherwise ungrouping date grouped dimension may crash, or produce
incorrect results.
Change-Id: I3634e3c0bf8336fc1221f5d234cb7e01eb1f07c6
Reviewed-on: https://gerrit.libreoffice.org/1247
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 14a0032..4225d1b 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -345,6 +345,8 @@ public:
const ScDPDimensionSaveData* GetExistingDimensionData() const
{ return pDimensionData; }
+void RemoveAllGroupDimensions( const rtl::OUString rSrcDimName,
std::vectorrtl::OUString* pDeletedNames = NULL );
+
SC_DLLPUBLIC ScDPDimensionSaveData* GetDimensionData(); // create if not
there
void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied
void BuildAllDimensionMembers(ScDPTableData* pData);
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index cab47a6..795bea3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2688,6 +2688,35 @@ void Test::testPivotTableDateGrouping()
CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess);
}
+// Remove all date grouping. The source dimension Date has two
+// external dimensions (Years and Quarters) and one internal (Date
+// the same name but different hierarchy). Remove all of them.
+pSaveData = pDPObj-GetSaveData();
+pSaveData-RemoveAllGroupDimensions(aBaseDimName);
+pDPObj-SetSaveData(*pSaveData);
+pDPObj-ReloadGroupTableData();
+pDPObj-InvalidateData();
+
+aOutRange = refresh(pDPObj);
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ Date, 0 },
+{ 2011-01-01, 1 },
+{ 2011-03-02, 2 },
+{ 2011-09-03, 7 },
+{ 2012-01-04, 3 },
+{ 2012-02-23, 4 },
+{ 2012-02-24, 5 },
+{ 2012-03-15, 6 },
+{ 2012-12-25, 8 },
+{ Total Result, 36 }
+};
+
+bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck,
Remove all date grouping.);
+CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess);
+}
+
pDPs-FreeTable(pDPObj);
CPPUNIT_ASSERT_EQUAL_MESSAGE(There should be no more tables.,
pDPs-GetCount(), static_castsize_t(0));
CPPUNIT_ASSERT_EQUAL_MESSAGE(There shouldn't be any more cache stored.,
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index f4b39ff..8db3c16 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -567,8 +567,18 @@ void ScDPObject::ReloadGroupTableData()
const ScDPDimensionSaveData* pDimData =
pSaveData-GetExistingDimensionData();
if (!pDimData || !pDimData-HasGroupDimensions())
-// No group dimensions exist.
+{
+// No group dimensions exist. Check if it currently has group
+// dimensions, and if so, remove all of them.
+ScDPGroupTableData* pData =
dynamic_castScDPGroupTableData*(mpTableData.get());
+if (pData)
+{
+// Replace the existing group table data with the source data.
+shared_ptrScDPTableData pSource = pData-GetSourceTableData();
+mpTableData = pSource;
+}
return;
+}
ScDPGroupTableData* pData =
dynamic_castScDPGroupTableData*(mpTableData.get());
if (pData)
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 5c987da..f86dce4 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1221,6 +1221,43 @@ bool ScDPSaveData::IsEmpty() const
return true; // no entries that are not hidden
}
+void ScDPSaveData::RemoveAllGroupDimensions( const OUString rSrcDimName,
std::vectorOUString* pDeletedNames )
+{
+if (!pDimensionData)
+// No group dimensions exist. Nothing to do.
+return;
+
+// Remove numeric group dimension (exists once at most). No need to delete
+// anything in save data (grouping was done inplace in an existing base
+// dimension).
+pDimensionData-RemoveNumGroupDimension(rSrcDimName);
+
+// Remove named group dimension(s). Dimensions have to be removed from
+// dimension save data and from save data too.
+const
[PUSHED] Change in core[libreoffice-3-6]: fdo#57497: Remove group table data when all group dimensions...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1247 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1247 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3634e3c0bf8336fc1221f5d234cb7e01eb1f07c6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - chart2/source
chart2/source/controller/dialogs/res_DataLabel.cxx |9 ++-
chart2/source/controller/main/ChartController_Properties.cxx |2
chart2/source/controller/main/DragMethod_RotateDiagram.cxx |3 -
chart2/source/inc/defines.hxx| 27 +++
chart2/source/tools/ThreeDHelper.cxx |4 -
chart2/source/view/axes/VCoordinateSystem.cxx|1
chart2/source/view/charttypes/PieChart.cxx | 10 +++-
chart2/source/view/charttypes/VSeriesPlotter.cxx |1
chart2/source/view/diagram/VDiagram.cxx |1
chart2/source/view/inc/ViewDefines.hxx |5 --
chart2/source/view/main/ChartView.cxx|1
chart2/source/view/main/PlottingPositionHelper.cxx |1
12 files changed, 51 insertions(+), 14 deletions(-)
New commits:
commit 6858182d246f21c5b06af09d8ff0e6fd04ef26c3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Dec 8 00:00:49 2012 -0500
bnc#791952: Setting properties for all data labels.
You can set different properties to individual data labels. But setting
new properties to all data labels should overwrite the individual settings.
Change-Id: I934bad89326115aa83feb86275cf380d701a5686
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 9113d90..a651eb8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -282,14 +282,15 @@ void DataLabelResources::EnableControls()
{
m_aCBSymbol.Enable( m_aCBNumber.IsChecked() || (m_aCBPercent.IsChecked()
m_aCBPercent.IsEnabled()) || m_aCBCategory.IsChecked() );
-//enable separator
+// Enable or disable separator, placement and direction based on the check
+// box states. Note that the check boxes are tri-state.
{
long nNumberOfCheckedLabelParts = 0;
-if( m_aCBNumber.IsChecked() )
+if (m_aCBNumber.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
-if( m_aCBPercent.IsChecked() m_aCBPercent.IsEnabled() )
+if (m_aCBPercent.GetState() != STATE_NOCHECK
m_aCBPercent.IsEnabled())
++nNumberOfCheckedLabelParts;
-if( m_aCBCategory.IsChecked() )
+if (m_aCBCategory.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
m_aSeparatorResources.Enable( nNumberOfCheckedLabelParts 1 );
bool bEnableTextDir = nNumberOfCheckedLabelParts 0;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index e0bf6ce..0f31720 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -231,7 +231,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pItemConverter = new wrapper::DataPointItemConverter(
xChartModel, xContext,
xObjectProperties, xSeries,
rDrawModel.GetItemPool(), rDrawModel,
uno::Reference
lang::XMultiServiceFactory ( xChartModel, uno::UNO_QUERY ),
-eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, false,
+eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat );
break;
}
commit e6591c6e940cc694aa68c97e287e59572f690d74
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Dec 7 21:14:50 2012 -0500
bnc#791952: Use center label placement for Best fit in pie charts.
It works better this way for Excel interoperability. In Excel, Best fit
is slightly different than the center placement, but the two are pretty
close in pie charts.
Change-Id: I7f04a1babb04fd488d8cf90df247c294fa9d7b67
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index fff4e98..e8fc689 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -449,9 +449,15 @@ void PieChart::createShapes()
}
sal_Int32 nLabelPlacement = pSeries-getLabelPlacement(
nPointIndex, m_xChartTypeModel, m_nDimension, m_pPosHelper-isSwapXAndY() );
+
+// AVOID_OVERLAP is in fact Best fit in the UI.
bool bMovementAllowed = ( nLabelPlacement ==
::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP );
if( bMovementAllowed )
-nLabelPlacement =
::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
+// Use center for Best fit for now. In the
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 4 commits - chart2/source
chart2/source/controller/dialogs/res_DataLabel.cxx |9 ++-
chart2/source/controller/main/ChartController_Properties.cxx |2
chart2/source/controller/main/DragMethod_RotateDiagram.cxx |3 -
chart2/source/inc/defines.hxx| 27 +++
chart2/source/tools/ThreeDHelper.cxx |4 -
chart2/source/view/axes/VCoordinateSystem.cxx|1
chart2/source/view/charttypes/PieChart.cxx | 10 +++-
chart2/source/view/charttypes/VSeriesPlotter.cxx |1
chart2/source/view/diagram/VDiagram.cxx |1
chart2/source/view/inc/ViewDefines.hxx |5 --
chart2/source/view/main/ChartView.cxx|1
chart2/source/view/main/PlottingPositionHelper.cxx |1
12 files changed, 51 insertions(+), 14 deletions(-)
New commits:
commit 7061f72159e38e76134bc7fefc8a75cd233889cf
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Dec 8 00:00:49 2012 -0500
bnc#791952: Setting properties for all data labels.
You can set different properties to individual data labels. But setting
new properties to all data labels should overwrite the individual settings.
Change-Id: I934bad89326115aa83feb86275cf380d701a5686
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 9113d90..a651eb8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -282,14 +282,15 @@ void DataLabelResources::EnableControls()
{
m_aCBSymbol.Enable( m_aCBNumber.IsChecked() || (m_aCBPercent.IsChecked()
m_aCBPercent.IsEnabled()) || m_aCBCategory.IsChecked() );
-//enable separator
+// Enable or disable separator, placement and direction based on the check
+// box states. Note that the check boxes are tri-state.
{
long nNumberOfCheckedLabelParts = 0;
-if( m_aCBNumber.IsChecked() )
+if (m_aCBNumber.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
-if( m_aCBPercent.IsChecked() m_aCBPercent.IsEnabled() )
+if (m_aCBPercent.GetState() != STATE_NOCHECK
m_aCBPercent.IsEnabled())
++nNumberOfCheckedLabelParts;
-if( m_aCBCategory.IsChecked() )
+if (m_aCBCategory.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
m_aSeparatorResources.Enable( nNumberOfCheckedLabelParts 1 );
bool bEnableTextDir = nNumberOfCheckedLabelParts 0;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index e0bf6ce..0f31720 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -231,7 +231,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pItemConverter = new wrapper::DataPointItemConverter(
xChartModel, xContext,
xObjectProperties, xSeries,
rDrawModel.GetItemPool(), rDrawModel,
uno::Reference
lang::XMultiServiceFactory ( xChartModel, uno::UNO_QUERY ),
-eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, false,
+eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat );
break;
}
commit fc04a3a9702580902312f5e8d6f3abd52f108663
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Dec 7 21:14:50 2012 -0500
bnc#791952: Use center label placement for Best fit in pie charts.
It works better this way for Excel interoperability. In Excel, Best fit
is slightly different than the center placement, but the two are pretty
close in pie charts.
Change-Id: I7f04a1babb04fd488d8cf90df247c294fa9d7b67
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index fff4e98..e8fc689 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -449,9 +449,15 @@ void PieChart::createShapes()
}
sal_Int32 nLabelPlacement = pSeries-getLabelPlacement(
nPointIndex, m_xChartTypeModel, m_nDimension, m_pPosHelper-isSwapXAndY() );
+
+// AVOID_OVERLAP is in fact Best fit in the UI.
bool bMovementAllowed = ( nLabelPlacement ==
::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP );
if( bMovementAllowed )
-nLabelPlacement =
::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
+// Use center for Best fit for now. In the
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 3 commits - chart2/source
chart2/source/controller/dialogs/res_DataLabel.cxx |9 +
chart2/source/controller/main/ChartController_Properties.cxx |2 +-
chart2/source/view/charttypes/PieChart.cxx | 10 --
3 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 495be57b8238361297f1834c2afbf808f1e55a3d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Sat Dec 8 00:00:49 2012 -0500
bnc#791952: Setting properties for all data labels.
You can set different properties to individual data labels. But setting
new properties to all data labels should overwrite the individual settings.
Change-Id: I934bad89326115aa83feb86275cf380d701a5686
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 1690ecd..c50d2b4 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -291,14 +291,15 @@ void DataLabelResources::EnableControls()
{
m_aCBSymbol.Enable( m_aCBNumber.IsChecked() || (m_aCBPercent.IsChecked()
m_aCBPercent.IsEnabled()) || m_aCBCategory.IsChecked() );
-//enable separator
+// Enable or disable separator, placement and direction based on the check
+// box states. Note that the check boxes are tri-state.
{
long nNumberOfCheckedLabelParts = 0;
-if( m_aCBNumber.IsChecked() )
+if (m_aCBNumber.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
-if( m_aCBPercent.IsChecked() m_aCBPercent.IsEnabled() )
+if (m_aCBPercent.GetState() != STATE_NOCHECK
m_aCBPercent.IsEnabled())
++nNumberOfCheckedLabelParts;
-if( m_aCBCategory.IsChecked() )
+if (m_aCBCategory.GetState() != STATE_NOCHECK)
++nNumberOfCheckedLabelParts;
m_aSeparatorResources.Enable( nNumberOfCheckedLabelParts 1 );
bool bEnableTextDir = nNumberOfCheckedLabelParts 0;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index 19f146a..005c076 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -242,7 +242,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
xObjectProperties, xSeries,
rDrawModel.GetItemPool(), rDrawModel,
pNumberFormatterWrapper,
uno::Reference
lang::XMultiServiceFactory ( xChartModel, uno::UNO_QUERY ),
-eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, false,
+eMapTo, pRefSize, bDataSeries,
bUseSpecialFillColor, nSpecialFillColor, true,
nNumberFormat, nPercentNumberFormat );
break;
}
commit 4128a957d7f41248f3e449ff002eb9c54b60d276
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Dec 7 21:14:50 2012 -0500
bnc#791952: Use center label placement for Best fit in pie charts.
It works better this way for Excel interoperability. In Excel, Best fit
is slightly different than the center placement, but the two are pretty
close in pie charts.
Change-Id: I7f04a1babb04fd488d8cf90df247c294fa9d7b67
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 8d558f1..e1ecf5b 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -460,9 +460,15 @@ void PieChart::createShapes()
}
sal_Int32 nLabelPlacement = pSeries-getLabelPlacement(
nPointIndex, m_xChartTypeModel, m_nDimension, m_pPosHelper-isSwapXAndY() );
+
+// AVOID_OVERLAP is in fact Best fit in the UI.
bool bMovementAllowed = ( nLabelPlacement ==
::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP );
if( bMovementAllowed )
-nLabelPlacement =
::com::sun::star::chart::DataLabelPlacement::OUTSIDE;
+// Use center for Best fit for now. In the future we
+// may want to implement a real best fit algorithm.
+// But center is good enough, and close to what Excel
+// does.
+nLabelPlacement =
::com::sun::star::chart::DataLabelPlacement::CENTER;
LabelAlignment eAlignment(LABEL_ALIGN_CENTER);
sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ;
commit 263861b0f6a3ea4581d966b42a10fae65a21c2fc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Dec 7 19:48:50 2012 -0500
bnc#791952: Better placement of 3D pie chart data labels.
This value appears to
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||57906 --- Comment #43 from Rainer Bielefeld libreoff...@bielefeldundbuss.de --- I add Bug 57906 - BUGZILLAASSISTANT: Submit fails with error message It looks like you didn't come from the right page Although it's not directly related to this LibO version, it would be a bad setback for pre release testing of 4.0 to have no BSA -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] minutes of ESC call ...
* Present: + Norbert, Ahmad, Eike, Stephan, Joel, Astron, Michael S, Fridrich, Kendy, Caolan, Tibby, Lionel, Michael M * Action Items + get binary signing key to Caolan (Fridrich/Thorsten) + upgrade Win32 build baseline to VS 2010 - as per tinderboxes (Fridrich) * Pending Action Items + add completed technical 4.0 changes to features wiki page (Michael) [ in progress ] + create a new AmbitiousHacks wiki page, based on GSOC page (Michael M) + minimal triage for good mentors for proposed easy hacks (Bjoern) + grok the list of contributors for suitable certified hackers (Kendy) + work on mail to encourage them to get certified (Kendy/Stephan/Bjoern) + pending list of people to poke. + disable Rhino / Beanshell unless in experimental mode (Michael) + check stlport situation with DudenCorrector (Thorsten) + tweak the configure defaults (Kendy) + no submodules by default, no gnome-vfs + come up with a proposal for UNO breakage / ns timestamps (Stephan, Michael S, Lionel) + persuade Thorsten of final MSI / pkg naming / resting place (Kendy) * UX input (Astron) + still working on the color picker + template manager design concerns (Cedric) + working to get it out of experimental mode + testing feedback, concerns about consistency around double-click vs. click + ongoing discussion. + testing of android/remote-presenter appreciated * Release Engineering update (Petr) + 4.0 timeline: feature-freeze status + Beta1 tag, Linux, Mac-Intel built, Win/Mac-PPC building + smoke-testing looks promising. + thanks to everyone that worked on it. + perhaps the easiest Beta1 yet. + 1350 commits in the last two weeks since Alpha 1. + any pending features that missed the freeze ? + they need to be in Beta2 + commit of fixes without review expected until RC1 + Personas need a few more days some UX review (Kendy) + features submitted to list / gerrit / without commit access before the freeze should still be merged ... + calc sort dialog change - got into 4.0 + Lionel's base performance work being tested in his private branch for merge; nails some MAB's + please don't forget to cherry-pick fixes from master - 4.0 + 3.6.4 retrospective + smooth release + good feedback from Rainer at least. + good to back-port MAB fixes from 4.0 to 3.6 as well + next release in January. AI: + setup LibreOffice 4.1 schedule in the wiki (Petr) + passing generic / Linux builds onto RedHat (Caolan) + 2nd VM setup - and all-lang configuration going well. + should finish tonight - mail the details. * Certification Committee update (Kendy/Stephan/Bjoern) + no action this week. * Features - please update: + http://wiki.documentfoundation.org/ReleaseNotes/4.0 + with screenshots / feature details ... * API cleanup - naming of new namespace (Kendy) + concerned about css:: going in - not an ideal namespace + for master - consider: what is the ideal outcome, how do we want to be seen from the outside ? + internally the code, engineer so we don't have to use any prefixes. + lang:: uno:: etc. + if we have new names/aliases - we get problems (Stephan) + differences internal vs. external are painful + open to dropping css:: for internal use + some compiler breakage without css:: (Norbert) + system names conflicts with 4.0.1 compiler bugs (?) + decision: drop ::com::sun::star:: for internal use on master * LGPL / mariadb mysql client library (Lionel) + identical C / client API: http://openquery.com/blog/mariadb-client-libraries-end-duallicensing + need a compatible C++ API / wrapper for existing code to work or mysql connector needs re-writing + that wrapper is useful - bringing us to a JDBC interface + volunteer(s) to help out here appreciated. * 4.0 completed tasks: + binfilter - removed completely (Norbert) + removes legacy StarOffice 1.0-5.0 binary filters + leaves .sxw .sxi etc. zip formats + dropped migrationAnalysis (Norbert) + obsolete, not-built, code removed now + not removing Lotus Word Pro filter + no good technical reasons to. + should we switch to native gtk+/print for 4.0 ? + no: not
Re: [Libreoffice-qa] Dailies by branch
Hi Pedro, On Thu, 2012-12-06 at 08:11 -0800, Pedro wrote: You (whoever did this) Actually, I've no idea who did this :-) we should find out, perhaps Norbert knows. could have done exactly the same while showing some consideration for the few people who still bother with QA and announcing the changes here first. Agreed. Apologies are nice but avoiding having to apologize is much better... Agreed again :-) BTW the build organization improved a lot. Well done! So you're generally happy with the change ? [ it'd be nice to avoid the back-compat symlinks if that works for everyone since they'd clutter the top-level with two inter-mingled un-related concepts: branch and build-system if possible ]. Florian Effenberger wrote I think this is rather a question for the developers, since that machine is maintained by them and I don't want to interfere with their way of working. :-) Yep. This is only a question for developers. Just ignore people who can't code. I'm sorry you feel that way: for me developers includes people doing the critical job of QA; I'd use 'hackers' for people doing the coding - not sure what Florian means. So - I'm sorry this was not discussed in advance here; Norbert - do you know off hand more about the story there ? All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ 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/
