Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)
On 02/22/2013 07:14 PM, Tom Tromey wrote: I'm curious what types of exceptions are actually thrown in LibreOffice. Does it throw -- scalars? Objects? Just pointers (Java style)? LibreOffice's UNO component system has a large exception hierarchy, which is modeled as a hierarchy of classes in C++. So what is thrown is typically (copies of) stack-allocated class instances, of specific sub-classes of com::sun::star::uno::Exception. If we had the convenience variable mentioned above, and if LibreOffice has a relatively simple exception identity measure (e.g., if you only throw pointers, you can just compare them with ==), then it could perhaps be done by: break at the losing catch, make a conditional catch throw, then re-run. Overall execution in LibreOffice is likely dynamic enough that the relevant exception class instance has different addresses in different runs. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLPlotAreaContext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 91b67ad7180c9957a5e1ff41be5af83b0759655c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 26 09:00:08 2013 +0100
get the x-error-import working as well, fdo#60083
Change-Id: I2d2af3944985776cb8bebf47322b348745d66410
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 4778e29..d28392d 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1056,6 +1056,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString
aStyleName, uno::Refere
{
sal_Int32 aBarStyle = com::sun::star::chart::ErrorBarStyle::NONE;
aAny = aBarStyle;
+xBarProp-setPropertyValue(ErrorBarStyle, aAny);
aAny = SchXMLTools::getPropertyFromContext(ShowPositiveError,
pSeriesStyleContext,pStylesCtxt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Mysql Connector Extension Size Confusion
On 02/22/2013 02:37 PM, Alexander Thurgood wrote: -rw-rw-r-- 1 1000 1000 5379260 janv. 3 03:44 /home/alex/Development/libo/core/mysqlc/unxlngx6.pro/bin/mysql-connector-ooo.oxt -rw-rw-r-- 1 1000 1000 2575973 févr. 13 12:20 /home/alex/Development/libo/core/workdir/unxlngx6.pro/ExtensionTarget/mysql-connector-ooo.oxt On 02/22/2013 03:35 PM, Alex Thurgood wrote: unzip -l Archive: /home/alex/Development/libo/core/workdir/unxlngx6.pro/ExtensionTarget/mysql-connector-ooo.oxt Length DateTimeName - -- - 0 2013-01-30 14:46 META-INF/ 1391 2013-02-13 12:20 META-INF/manifest.xml 255 2013-01-30 11:41 description-en-US.txt 1743 2013-02-13 12:20 description.xml 838 2013-01-30 11:41 images/extension_32.png 4722905 2013-02-10 11:51 libmysqlcppconn.so 4180182 2013-02-13 12:19 mysqlc.uno.so 0 2013-01-30 14:46 registration/ 436392 2013-02-13 12:20 registration/LICENSE 3561 2013-01-30 11:44 registry/data/org/openoffice/Office/DataAccess/Drivers.xcu 311 2013-02-10 14:26 components.rdb - --- 9347578 11 files ^^^ but the above ls output indicated this file was much smaller than the other, old one, rather than much larger? Stephan unzip -l Archive: /home/alex/Development/libo/core/mysqlc/unxlngx6.pro/bin/mysql-connector-ooo.oxt Length DateTimeName - -- - 0 2013-01-03 03:44 META-INF/ 1392 2013-01-03 03:44 META-INF/manifest.xml 255 2013-01-03 03:44 description-en-US.txt 1743 2013-01-03 03:44 description.xml 0 2013-01-03 03:44 images/ 838 2013-01-03 03:44 images/extension_32.png 739047 2013-01-03 03:44 libmysqlcppconn.so 4186992 2013-01-03 03:44 mysqlc.uno.so 0 2013-01-03 03:44 registration/ 442492 2013-01-03 03:44 registration/LICENSE 0 2013-01-03 03:44 registry/ 0 2013-01-03 03:44 registry/data/ 0 2013-01-03 03:44 registry/data/org/ 0 2013-01-03 03:44 registry/data/org/openoffice/ 0 2013-01-03 03:44 registry/data/org/openoffice/Office/ 0 2013-01-03 03:44 registry/data/org/openoffice/Office/DataAccess/ 3561 2013-01-03 03:44 registry/data/org/openoffice/Office/DataAccess/Drivers.xcu - --- 5376320 17 files ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regression - LO Writer 4.0
Hi, 2013/2/25 Michael Stahl mst...@redhat.com: that regression was only on master, not on libreoffice-4-0. Indeed. i rather suspect the performance problem was caused by the synchronous word count that is now running async in 4.0.1 (thanks to mmeeks). Thanks for the information and the fix! László ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac
0 files changed New commits: commit 07aca2c6966d557f536383d6541bf04a04123c5c Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 09:38:32 2013 +0100 Remove inadvertent execute bits again Change-Id: If98d499a6faf8faa7e77c2fb1af634e464db881e diff --git a/config_host.mk.in b/config_host.mk.in old mode 100755 new mode 100644 diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 7b6cac16ef01cd80f54ea75c72e0de9887bbf97a Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 09:39:29 2013 +0100 Clean up Change-Id: I25cde2532ed9228b5b674908050a275c4206599e diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index d2409ec..349effb 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_autodoc \ CustomTarget_idl \ Executable_unoapploader \ + Zip_odkcommon \ Zip_odkexamples \ )) @@ -33,9 +34,4 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif -$(eval $(call gb_Module_add_targets,odk,\ - Zip_odkcommon \ -)) - - # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
execute bits in GIT
Perhaps we need to add a new rule to the git-commit-hook? Original Message Subject:[Libreoffice-commits] core.git: config_host.mk.in configure.ac Date: Tue, 26 Feb 2013 00:38:55 -0800 (PST) From: Stephan Bergmann sberg...@redhat.com Reply-To: libreoffice@lists.freedesktop.org To: libreoffice-comm...@lists.freedesktop.org 0 files changed New commits: commit 07aca2c6966d557f536383d6541bf04a04123c5c Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 09:38:32 2013 +0100 Remove inadvertent execute bits again Change-Id: If98d499a6faf8faa7e77c2fb1af634e464db881e diff --git a/config_host.mk.in b/config_host.mk.in old mode 100755 new mode 100644 diff --git a/configure.ac b/configure.ac old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] convert odk to gbuild and add to tail_build
On Mon, Feb 25, 2013 at 04:45:08PM -0500, Peter Foley pefol...@verizon.net wrote: I can't reproduce this. It might be a parallelism issue. What -j option are you using? config_host.mk has 'export PARALLELISM?=4' here. But I didn't hit the issue today, so either it was just something random or has been fixed since yesterday. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit b30e154c2b861397a80515ab8a18b6f0558a0939 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 09:57:20 2013 +0100 Revert Clean up This reverts commit 7b6cac16ef01cd80f54ea75c72e0de9887bbf97a, dependency hell. diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 349effb..d2409ec 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_autodoc \ CustomTarget_idl \ Executable_unoapploader \ - Zip_odkcommon \ Zip_odkexamples \ )) @@ -34,4 +33,9 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif +$(eval $(call gb_Module_add_targets,odk,\ + Zip_odkcommon \ +)) + + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - xmloff/source
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 141 --
1 file changed, 88 insertions(+), 53 deletions(-)
New commits:
commit 01f8d0a1dffce854a66c0f957e81e6df6d361a86
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 26 07:38:06 2013 +0100
get error bar import working again, fdo#60083
Change-Id: I8022fbfc8d372c9863d236253a2a63364198bfc8
Reviewed-on: https://gerrit.libreoffice.org/2415
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 0697e8e..e5b16fd 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1037,6 +1037,91 @@
SchXMLStatisticsObjectContext::~SchXMLStatisticsObjectContext()
{
}
+namespace {
+
+void SetErrorBarPropertiesFromStyleName( const OUString aStyleName,
uno::Reference beans::XPropertySet xBarProp,
+SchXMLImportHelper rImportHelper)
+{
+const SvXMLStylesContext* pStylesCtxt =
rImportHelper.GetAutoStylesContext();
+const SvXMLStyleContext* pStyle =
pStylesCtxt-FindStyleChildContext(rImportHelper.GetChartFamilyID(),
+aStyleName);
+
+XMLPropStyleContext * pSeriesStyleContext =
+const_cast XMLPropStyleContext * ( dynamic_cast const
XMLPropStyleContext * ( pStyle ));
+
+uno::Any aAny = SchXMLTools::getPropertyFromContext(ErrorBarStyle,
+pSeriesStyleContext,pStylesCtxt);
+
+if ( aAny.hasValue() )
+{
+sal_Int32 aBarStyle = com::sun::star::chart::ErrorBarStyle::NONE;
+aAny = aBarStyle;
+xBarProp-setPropertyValue(ErrorBarStyle, aAny);
+
+aAny = SchXMLTools::getPropertyFromContext(ShowPositiveError,
+pSeriesStyleContext,pStylesCtxt);
+
+if(aAny.hasValue())
+xBarProp-setPropertyValue(ShowPositiveError,aAny);
+
+aAny = SchXMLTools::getPropertyFromContext(ShowNegativeError,
+pSeriesStyleContext,pStylesCtxt);
+
+if(aAny.hasValue())
+xBarProp-setPropertyValue(ShowNegativeError,aAny);
+
+aAny = SchXMLTools::getPropertyFromContext(PositiveError,
+pSeriesStyleContext, pStylesCtxt);
+
+if(aAny.hasValue())
+xBarProp-setPropertyValue(PositiveError, aAny);
+else
+{
+aAny = SchXMLTools::getPropertyFromContext(ConstantErrorHigh,
+pSeriesStyleContext, pStylesCtxt);
+
+if(aAny.hasValue())
+xBarProp-setPropertyValue(PositiveError, aAny);
+}
+
+aAny = SchXMLTools::getPropertyFromContext(NegativeError,
+pSeriesStyleContext, pStylesCtxt);
+
+if(aAny.hasValue())
+xBarProp-setPropertyValue(NegativeError, aAny);
+else
+{
+aAny = SchXMLTools::getPropertyFromContext(ConstantErrorLow,
+pSeriesStyleContext, pStylesCtxt);
+
+if(aAny.hasValue())
+xBarProp-setPropertyValue(NegativeError, aAny);
+}
+
+switch(aBarStyle)
+{
+case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN:
+{
+aAny = SchXMLTools::getPropertyFromContext(NegativeError,
+pSeriesStyleContext,pStylesCtxt);
+
+xBarProp-setPropertyValue(NegativeError,aAny);
+
+aAny = SchXMLTools::getPropertyFromContext(PositiveError,
+pSeriesStyleContext,pStylesCtxt);
+
+xBarProp-setPropertyValue(PositiveError,aAny);
+}
+break;
+default:
+break;
+}
+}
+}
+
+}
+
+
void SchXMLStatisticsObjectContext::StartElement( const uno::Reference
xml::sax::XAttributeList xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is()? xAttrList-getLength(): 0;
@@ -1096,15 +1181,10 @@ void SchXMLStatisticsObjectContext::StartElement( const
uno::Reference xml::sax
xBarProp-setPropertyValue(ShowPositiveError,uno::makeAny(sal_True));
xBarProp-setPropertyValue(ShowNegativeError,uno::makeAny(sal_True));
-const SvXMLStylesContext* pStylesCtxt =
mrImportHelper.GetAutoStylesContext();
-const SvXMLStyleContext* pStyle =
pStylesCtxt-FindStyleChildContext(
-mrImportHelper.GetChartFamilyID(), sAutoStyleName );
-// note: SvXMLStyleContext::FillPropertySet is not const
-XMLPropStyleContext * pErrorStyleContext =
-const_cast XMLPropStyleContext * ( dynamic_cast
const XMLPropStyleContext * ( pStyle ));
-
-pErrorStyleContext-FillPropertySet( xBarProp );
+// first import
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 852cc47ab65bdddfb77eda594ab0b7aeabc5c5d7 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 10:07:38 2013 +0100 Add comment about dependency gotcha Change-Id: Ia3eee9d4c06ef3411ad0a8547edcb08fe901d9dc diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index d2409ec..c66e1dd 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif +# This apparently needs to come last, as the various CustomTarget_* add to +# odkcommon_ZIPLIST that is used here: $(eval $(call gb_Module_add_targets,odk,\ Zip_odkcommon \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_install.mk setup_native/CustomTarget_mac.mk
instsetoo_native/CustomTarget_install.mk | 12 ++--
setup_native/CustomTarget_mac.mk |2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c18e468125c32d8dca88c374d534cab1e9597d03
Author: Andras Timar ati...@suse.com
Date: Tue Feb 26 10:08:32 2013 +0100
setup_native: fix localization
Change-Id: I3a179076f7102958fd2d8f24af1288aa610835da
diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk
index 57f92f8..d91c6bd 100644
--- a/setup_native/CustomTarget_mac.mk
+++ b/setup_native/CustomTarget_mac.mk
@@ -16,7 +16,7 @@ ifneq ($(WITH_LANG),)
$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf:
$(SRCDIR)/setup_native/source/mac/macinstall.ulf | $(call
gb_Executable_get_runtime_dependencies,ulfex)
$(call gb_Output_announce,$@,$(true),SUM,1)
MERGEINPUT=`$(gb_MKTEMP)` \
- echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po)
$${MERGEINPUT} \
+ echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/setup_native/source/mac.po)
$${MERGEINPUT} \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -p setup_native -i $ -o $@ -m
$${MERGEINPUT} -l all ) \
rm -rf $${MERGEINPUT}
commit a5e5dc9c622b47d6454938936e7b65beb9f461b1
Author: Andras Timar ati...@suse.com
Date: Tue Feb 26 10:06:36 2013 +0100
instsetoo_native: fix localization
Change-Id: I8cb1baecb7034511b8dfcecefc58de2fb3f59061
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 6c44b7c..8b55cad 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -35,15 +35,15 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%
chmod a+x $@
ifneq ($(WITH_LANG),)
-$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.mlf: \
+$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \
$(call gb_Executable_get_runtime_dependencies,ulfex)
$(call gb_Output_announce,$@,$(true),SUM,1)
-MERGEINPUT=`$(gb_MKTEMP)` \
-echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po)
$${MERGEINPUT} \
-$(call gb_Helper_abbreviate_dirs,\
-$(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $ -o
$@ -m $${MERGEINPUT} -l all ) \
-rm -rf $${MERGEINPUT}
+ MERGEINPUT=`$(gb_MKTEMP)` \
+ echo $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po)
$${MERGEINPUT} \
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $ -o $@
-m $${MERGEINPUT} -l all ) \
+ rm -rf $${MERGEINPUT}
else
$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/mscrypt/oid.hxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit f1a96446fab8f65e77a1cb0996e43c6523fe2873
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 25 20:50:19 2013 +0100
Remove duplicate OID
This ID is refers to digestedData and hashedData.
http://msdn.microsoft.com/en-us/library/windows/desktop/aa381133(v=vs.85).aspx
Change-Id: I2b9585332e27fad860aee458ef3183a9772e9c3f
Reviewed-on: https://gerrit.libreoffice.org/2403
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index acbaa50..88f4c74 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -58,7 +58,6 @@ OIDItem OIDs[] = {
{1.2.840.113549.1.7.3,PKCS #7 Enveloped Data},
{1.2.840.113549.1.7.4,PKCS #7 Signed and Enveloped Data},
{1.2.840.113549.1.7.5,PKCS #7 Digested Data},
-{1.2.840.113549.1.7.5,PKCS #7 Digested Data},
{1.2.840.113549.1.7.6,PKCS #7 Encrypted Data},
{1.2.840.113549.1.9.1,PKCS #9 Email Address},
{1.2.840.113549.1.9.2,PKCS #9 Unstructured Name},
@@ -150,7 +149,7 @@ OIDItem OIDs[] = {
{1.2.643.2.2.36.0, GOST_R_34.10-2001_Sign_DH_PRO}
};
-int nOID = 120;
+int nOID = 119;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sw/source
sw/source/core/txtnode/ndtxt.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 282af14d3c021ad6927bc909161c0ff7b31fa1c9
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 25 22:06:18 2013 +0100
fdo#61428: SwTxtNode::ReplaceText: brown paperbag fix
Fix the optimization to return only if both replacement and replaced
strings are empty.
(regression from b6d45f26ea5bcc848737921b59a16253eb1d8587)
Change-Id: I984fb151a5ac3e6eb8d03f854ad6a3df88f96000
(cherry picked from commit 3e6a0b6d04722d43a1fc8d3745b5e79b7ced90eb)
Reviewed-on: https://gerrit.libreoffice.org/2407
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
(cherry picked from commit 3f5361a9402cd6df4da7fb98108ae1906b41edd3)
Reviewed-on: https://gerrit.libreoffice.org/2408
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index ee1dd01..2cc28ae 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3337,9 +3337,9 @@ void SwTxtNode::ReplaceText( const SwIndex rStart, const
xub_StrLen nDelLen,
SwTxtNode::ReplaceText: node text with insertion TXTNODE_MAX.);
OUString const sInserted(
(nOverflow 0) ? rStr.Copy(0, rStr.Len() - nOverflow) : rStr);
-if (sInserted.isEmpty())
+if (sInserted.isEmpty() 0 == nDelLen)
{
-return;
+return; // nothing to do
}
const xub_StrLen nStartPos = rStart.GetIndex();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: moz module gbuildification?
On Mon Feb 25, Andras Timar wrote: Did you try it on Windows with --enable-win-mozab-driver? For me the build failed, moz headers were not in place when connectivity module needed them. should be fixed now. David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED]
On 02/25/2013 04:03 AM, Gregg King wrote: Looking at getting into helping with LO. Great! Partial fix for the spelling errors list in BUG 60724 (https://bugs.freedesktop.org/show_bug.cgi?id=60724) I fixed spellings from charcters to characters. So this was apparently fixed in parallel by multiple people, and has since been sorted out at https://bugs.freedesktop.org/show_bug.cgi?id=60724 spelling errors and typos in binaries found by lintian. Seen pushed. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: execute bits in GIT
Hi Noel, On Tue, 2013-02-26 at 10:43 +0200, Noel Grandin wrote: Perhaps we need to add a new rule to the git-commit-hook? The git hooks are in the repo: contrib/dev-tools in the module git-hooks/ - do have a hack at them there, and poke me when you're happy I'll push them. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: execute bits in GIT
On Tue, Feb 26, 2013 at 09:26:31AM +, Michael Meeks michael.me...@suse.com wrote: The git hooks are in the repo: contrib/dev-tools in the module git-hooks/ - do have a hack at them there, and poke me when you're happy I'll push them. Those are the server-side hooks; if we want an automatic check for this kind of errors, then core.git has .git-hooks/pre-commit, that should be tweaked, I think. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/comment.ui | 237 + 1 file changed, 237 insertions(+) New commits: commit 5d9cf23fd3956d5165ced2dab119f0dce0173f49 Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Mon Feb 4 10:41:34 2013 +0300 Converted Edit - Changes - Comment Widget. Change-Id: Ie8ed01d283559aba5eae1df7a21c6fe019457a7f Reviewed-on: https://gerrit.libreoffice.org/1978 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui new file mode 100644 index 000..26d55b8 --- /dev/null +++ b/cui/uiconfig/ui/comment.ui @@ -0,0 +1,237 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Comment: Insertion +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +property name=yalign0.5099046325684/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +property name=xalign0.5198092651367/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=spacing10/property +child + object class=GtkLabel id=label2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesAuthor/property + /object +
[Libreoffice-commits] core.git: odk/CustomTarget_include.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk
odk/CustomTarget_include.mk |6 -- odk/CustomTarget_odkcommon.mk |1 + odk/Module_odk.mk |1 + 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit de471513bb012839e6c5d1640ed22b6c24bd8ec0 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 10:58:48 2013 +0100 CustomTarget_include had apparently been forgotten Change-Id: If61617ae3d18ef4f15f2d150af76f0b1b64a3fa6 diff --git a/odk/CustomTarget_include.mk b/odk/CustomTarget_include.mk index 7f4ec62..08f10c4 100644 --- a/odk/CustomTarget_include.mk +++ b/odk/CustomTarget_include.mk @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/include)) + include $(SRCDIR)/solenv/inc/udkversion.mk odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \ @@ -27,7 +29,7 @@ odk_INCLIST := $(subst $(OUTDIR)/inc/,,$(shell find \ define odk_inc odkcommon_ZIPLIST += include/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon): $(odk_WORKDIR)/include/$(1) +$(call gb_CustomTarget_get_target,odk/odkcommon/include): $(odk_WORKDIR)/include/$(1) $(odk_WORKDIR)/include/$(1): $(foreach dir,$(odk_INCDIRLIST),$(call gb_Package_get_target,$(dir)_inc)) mkdir -p $$(dir $$@) $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) @@ -37,7 +39,7 @@ endef $(foreach inc,$(odk_INCLIST),$(eval $(call odk_inc,$(inc odkcommon_ZIPLIST += include/udkversion.mk -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon,include/udkversion.mk)) +$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/include,include/udkversion.mk)) $(odk_WORKDIR)/include/udkversion.mk: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo #UDK version number $@ diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 11a775a..03c44ab 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -21,6 +21,7 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(call gb_CustomTarget_get_target,odk/odkcommon/bin) \ $(call gb_CustomTarget_get_target,odk/odkcommon/lib) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ + $(call gb_CustomTarget_get_target,odk/odkcommon/include) \ $(if $(filter MSC,$(COM)),$(call gb_CustomTarget_get_target,odk/odkcommon/cli)) ifeq ($(OS),WNT) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index c66e1dd..f93a6c6 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_settings \ CustomTarget_autodoc \ CustomTarget_idl \ + CustomTarget_include \ Executable_unoapploader \ Zip_odkexamples \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source framework/inc framework/source odk/examples
filter/source/config/cache/filtercache.cxx |2 +- framework/inc/interaction/quietinteraction.hxx |2 +- framework/source/inc/loadenv/loadenvexception.hxx |4 ++-- framework/source/jobs/jobdispatch.cxx |2 +- odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java |2 +- 5 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 6e1323a876f2b77901e1beb1737e4def3a6abf04 Author: Gregg King smoked...@gmail.com Date: Mon Feb 25 22:46:05 2013 -0400 fdo#60724: lintian typo fix: useful - useful Change-Id: I5635c3efaaa6bbe1c1e3ec41a502e203fe17e47c diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 34a464f..0494553 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -2232,7 +2232,7 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString sValue, /*--- TODO work on a cache copy first, which can be flushed afterwards - That would be usefully to gurantee a consistent cache. + That would be useful to guarantee a consistent cache. ---*/ void FilterCache::impl_readOldFormat() throw(css::uno::Exception) diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 2eab314..0118301 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -117,7 +117,7 @@ class QuietInteraction : public css::lang::XTypeProvider //_ /** @short returns information if interaction was used -@descr It can be usefully to know the reason for a failed operation. +@descr It can be useful to know the reason for a failed operation. @return [boolean] TRUE/ for used interaction diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index a1b4be2..9bd6773 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -109,8 +109,8 @@ class LoadEnvException css::uno::Any m_exOriginal; /** TODO - Experimental use! May it can be usefully to know, if an exception was already - catched and handled by an interaction and was might be rethrowed! */ + Experimental use! Maybe it can be useful to know if an exception was already + catched and handled by an interaction and might be rethrown! */ sal_Bool m_bHandled; //___ diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 2ee99ba..74ad025 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -323,7 +323,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString /** @short dispatch a service @descr We use the given name only to create and if possible to initialize -it as an uno service. It can be usefully for creating (caching?) +it as an uno service. It can be useful for creating (caching?) of e.g. one instance services. @param sService diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java index a386d68..08a84c6 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java @@ -107,7 +107,7 @@ public class AsciiReplaceFilter /** * special debug helper to get an idea how expensive * the implemented filter operations are realy. -* May be usefully for own purposes. +* May be useful for own purposes. * * To see the output inside an office environment * use soffice ...params... output.txt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa
sc/inc/userdat.hxx|2
sc/qa/unit/data/ods/legacycellanchoredrotatedclippedshape.ods |binary
sc/qa/unit/data/ods/legacycellanchoredrotatedhiddenshape.ods |binary
sc/qa/unit/data/ods/legacycellanchoredrotatedshape.ods|binary
sc/qa/unit/filters-test.cxx | 114 +-
sc/qa/unit/helper/qahelper.hxx|5
sc/qa/unit/ucalc.cxx | 83 +++
7 files changed, 202 insertions(+), 2 deletions(-)
New commits:
commit dcf35f6fccde97692fc515ae6ec4d24f1c9276f9
Author: Noel Power noel.po...@suse.com
Date: Tue Feb 26 09:58:45 2013 +
add some shape anchor related tests ( for rotated shapes )
Change-Id: I6363c408c1205c99cd11cada3877a3006022d06b
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 29f09b5..537e3ae 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -48,7 +48,7 @@ public:
//-
-class ScDrawObjData : public SdrObjUserData
+class SC_DLLPUBLIC ScDrawObjData : public SdrObjUserData
{
public:
enum Type { CellNote, ValidationCircle, DetectiveArrow, DrawingObject };
diff --git a/sc/qa/unit/data/ods/legacycellanchoredrotatedclippedshape.ods
b/sc/qa/unit/data/ods/legacycellanchoredrotatedclippedshape.ods
new file mode 100644
index 000..45cf2cc
Binary files /dev/null and
b/sc/qa/unit/data/ods/legacycellanchoredrotatedclippedshape.ods differ
diff --git a/sc/qa/unit/data/ods/legacycellanchoredrotatedhiddenshape.ods
b/sc/qa/unit/data/ods/legacycellanchoredrotatedhiddenshape.ods
new file mode 100644
index 000..48b1e74
Binary files /dev/null and
b/sc/qa/unit/data/ods/legacycellanchoredrotatedhiddenshape.ods differ
diff --git a/sc/qa/unit/data/ods/legacycellanchoredrotatedshape.ods
b/sc/qa/unit/data/ods/legacycellanchoredrotatedshape.ods
new file mode 100644
index 000..271eab5
Binary files /dev/null and
b/sc/qa/unit/data/ods/legacycellanchoredrotatedshape.ods differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 0f7d890..19ad9fb 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -51,6 +51,9 @@
#include scitems.hxx
#include document.hxx
#include cellform.hxx
+#include drwlayer.hxx
+#include userdat.hxx
+#include svx/svdpage.hxx
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -81,7 +84,6 @@ public:
void testContentXLS();
void testContentXLSX();
void testContentLotus123();
-
#if TEST_BUG_FILES
//goes recursively through all files in this dir and tries to open them
void testDir(osl::Directory rDir, sal_Int32 nType);
@@ -90,6 +92,7 @@ public:
void testBugFilesXLS();
void testBugFilesXLSX();
#endif
+void testLegacyCellAnchoredRotatedShape();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testCVEs);
@@ -98,6 +101,7 @@ public:
CPPUNIT_TEST(testContentXLS);
CPPUNIT_TEST(testContentXLSX);
CPPUNIT_TEST(testContentLotus123);
+CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
#if TEST_BUG_FILES
CPPUNIT_TEST(testBugFiles);
@@ -331,6 +335,114 @@ void ScFiltersTest::testContentLotus123()
testContentImpl(pDoc, LOTUS123);
xDocSh-DoClose();
}
+void impl_testLegacyCellAnchoredRotatedShape( ScDocument* pDoc, Rectangle
aRect, ScDrawObjData aAnchor )
+{
+const long TOLERANCE = 30; //30 hmm
+ScDrawLayer* pDrawLayer = pDoc-GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE(No drawing layer., pDrawLayer);
+SdrPage* pPage = pDrawLayer-GetPage(0);
+CPPUNIT_ASSERT_MESSAGE(No page instance for the 1st sheet., pPage);
+CPPUNIT_ASSERT_EQUAL( sal_uIntPtr(1), pPage-GetObjCount() );
+
+SdrObject* pObj = pPage-GetObj(0);
+const Rectangle aSnap = pObj-GetSnapRect();
+printf(expected height %ld actual %ld\n, aRect.GetHeight(),
aSnap.GetHeight() );
+CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.GetHeight(),
aSnap.GetHeight(), TOLERANCE ) );
+printf(expected width %ld actual %ld\n, aRect.GetWidth(),
aSnap.GetWidth() );
+CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.GetWidth(),
aSnap.GetWidth(), TOLERANCE ) );
+printf(expected left %ld actual %ld\n, aRect.Left(), aSnap.Left() );
+CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.Left(),
aSnap.Left(), TOLERANCE ) );
+printf(expected right %ld actual %ld\n, aRect.Top(), aSnap.Top() );
+CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.Top(),
aSnap.Top(), TOLERANCE ) );
+
+
+ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj );
+printf(expected startrow %d actual %d\n, aAnchor.maStart.Row(),
pData-maStart.Row() );
+CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Row(), pData-maStart.Row() );
+printf(expected startcol %d actual %d\n, aAnchor.maStart.Col(),
pData-maStart.Col() );
+CPPUNIT_ASSERT_EQUAL(
[Libreoffice-commits] core.git: 3 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk solenv/bin svx/inc sw/source
cui/AllLangResTarget_cui.mk |1
cui/UI_cui.mk |1
cui/source/dialogs/postdlg.cxx| 110
cui/source/dialogs/postdlg.hrc| 41 ---
cui/source/dialogs/postdlg.src| 123 --
cui/source/factory/dlgfact.cxx| 13 --
cui/source/factory/dlgfact.hxx|2
cui/source/inc/helpid.hrc |1
cui/source/inc/postdlg.hxx| 68 +++-
cui/uiconfig/ui/comment.ui| 203 +++--
cui/uiconfig/ui/protectrecords.ui | 204 --
solenv/bin/callcatcher.Makefile |2
svx/inc/svx/dialogs.hrc |1
svx/inc/svx/svxdlg.hxx|2
sw/source/ui/misc/redlndlg.cxx|2
sw/source/ui/shells/textfld.cxx |2
16 files changed, 239 insertions(+), 537 deletions(-)
New commits:
commit 58ba8835bcf615cb6d3563c24b3d4d69b32f1b4f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 26 00:05:58 2013 +
adapt code to comment .ui conversion
Change-Id: I93f98f50443ab3b2fb0ce9f3126b03c8a3281ad2
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 13aead5..bcf726e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/iconcdlg.src \
cui/source/dialogs/multipat.src \
cui/source/dialogs/passwdomdlg.src \
-cui/source/dialogs/postdlg.src \
cui/source/dialogs/scriptdlg.src \
cui/source/dialogs/sdrcelldlg.src \
cui/source/dialogs/showcols.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 9e3a396..7f34a87 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
+ cui/uiconfig/ui/comment \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
cui/uiconfig/ui/effectspage \
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 7a944e2..7fbf2e7 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -28,77 +28,56 @@
#include unotools/localedatawrapper.hxx
#include comphelper/processfactory.hxx
#include svx/svxids.hrc // SID_ATTR_...
-#include svx/dialogs.hrc // RID_SVXDLG_POSTIT
#define _SVX_POSTDLG_CXX
#include cuires.hrc
-#include postdlg.hrc
#include svx/postattr.hxx
#include postdlg.hxx
#include dialmgr.hxx
#include helpid.hrc
-// static
-
-static sal_uInt16 pRanges[] =
-{
-SID_ATTR_POSTIT_AUTHOR,
-SID_ATTR_POSTIT_TEXT,
-0
-};
-
// class SvxPostItDialog -
-SvxPostItDialog::SvxPostItDialog( Window* pParent,
- const SfxItemSet rCoreSet,
- sal_Bool bPrevNext,
- sal_Bool bRedline ) :
-
-SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_POSTIT ) ),
-
-aPostItFL ( this, CUI_RES( FL_POSTIT ) ),
-aLastEditLabelFT( this, CUI_RES( FT_LASTEDITLABEL ) ),
-aLastEditFT ( this, CUI_RES( FT_LASTEDIT ) ),
-aEditFT ( this, CUI_RES( FT_EDIT ) ),
-aEditED ( this, CUI_RES( ED_EDIT ) ),
-aAuthorFT ( this, CUI_RES( FT_AUTHOR) ),
-aAuthorBtn ( this, CUI_RES( BTN_AUTHOR ) ),
-aOKBtn ( this, CUI_RES( BTN_POST_OK ) ),
-aCancelBtn ( this, CUI_RES( BTN_POST_CANCEL ) ),
-aHelpBtn( this, CUI_RES( BTN_POST_HELP ) ),
-aPrevBtn( this, CUI_RES( BTN_PREV ) ),
-aNextBtn( this, CUI_RES( BTN_NEXT ) ),
-
-rSet( rCoreSet ),
-pOutSet ( 0 )
-
+SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet rCoreSet,
+bool bPrevNext, bool bRedline)
+: SfxModalDialog(pParent, CommentDialog, cui/ui/comment.ui)
+, rSet(rCoreSet)
+, pOutSet(0)
{
+get(m_pLastEditFT, lastedit);
+get(m_pInsertAuthor, insertauthor);
+get(m_pAuthorBtn, author);
+get(m_pOKBtn, ok);
+get(m_pPrevBtn, previous);
+get(m_pNextBtn, next);
+get(m_pEditED, edit);
+
if (bRedline) // HelpIDs for redlining
{
SetHelpId(HID_REDLINING_DLG);
-aEditED.SetHelpId(HID_REDLINING_EDIT);
-aPrevBtn.SetHelpId(HID_REDLINING_PREV);
-aNextBtn.SetHelpId(HID_REDLINING_NEXT);
+m_pEditED-SetHelpId(HID_REDLINING_EDIT);
+m_pPrevBtn-SetHelpId(HID_REDLINING_PREV);
+m_pNextBtn-SetHelpId(HID_REDLINING_NEXT);
}
-aPrevBtn.SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) );
-aNextBtn.SetClickHdl( LINK( this, SvxPostItDialog, NextHdl ) );
-aAuthorBtn.SetClickHdl( LINK( this, SvxPostItDialog, Stamp ) );
-aOKBtn.SetClickHdl( LINK( this, SvxPostItDialog, OKHdl ) );
+
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |1 +
1 file changed, 1 insertion(+)
New commits:
commit b4e8f99a253ee20cba0718d042ca17cca2e8dcb5
Author: Andras Timar ati...@suse.com
Date: Tue Feb 26 11:02:56 2013 +0100
instsetoo_native: fix helppack generation
Change-Id: I30778847b23aabccba2275d518eba7f57ffcefd5
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 8b55cad..6f12965 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -62,6 +62,7 @@ instsetoo_native_WITH_LANG := en-US $(filter-out
en-US,$(gb_WITH_LANG))
ifeq (WNT,$(OS))
define instsetoo_native_msitemplates
+
TEMPLATE_DIR=$(dir $@)msi_templates \
rm -rf $${TEMPLATE_DIR} \
mkdir -p $${TEMPLATE_DIR}/Binary \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b50c8f2cbc477a784dec00be1a91e4743bd2cf8a
Author: Radek Doulik r...@novell.com
Date: Fri Dec 14 12:09:36 2012 +0100
fix emf+ rendering
Change-Id: Ib49898362f7e648a8ce9c27b5e5b4f0b2ad93afd
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index b78ac5b..f9d583d 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1631,8 +1631,9 @@ namespace drawinglayer
case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
{
static bool bUseMetaFilePrimitiveDecomposition(true);
+const primitive2d::MetafilePrimitive2D aMetafile =
static_cast const primitive2d::MetafilePrimitive2D (rCandidate);
-if(bUseMetaFilePrimitiveDecomposition)
+if(bUseMetaFilePrimitiveDecomposition
!aMetafile.getMetaFile().GetUseCanvas())
{
// use new Metafile decomposition
process(rCandidate.get2DDecomposition(getViewInformation2D()));
@@ -1640,7 +1641,7 @@ namespace drawinglayer
else
{
// direct draw of MetaFile, use default pocessing
-RenderMetafilePrimitive2D(static_cast const
primitive2d::MetafilePrimitive2D (rCandidate));
+RenderMetafilePrimitive2D(aMetafile);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 83707a8b8a47efd074b7f03df0da779870efa687
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 25 13:15:19 2013 +0100
fdo#59405: cppcanvas: fix infinite loop in processEMFPlus
This can be observed when inserting the bugdoc from fdo#59405.
Apparently the size and length do not agree; ensure that the
length does not underflow.
Change-Id: Idfc68919859b8284c724831de21208e4392af328
(cherry picked from commit ec0d1440cf07008a220708535848567bcbb233ea)
Reviewed-on: https://gerrit.libreoffice.org/2394
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com
(cherry picked from commit 6cf68eab5eb77b7e081ef5f8d59d196411e86567)
Reviewed-on: https://gerrit.libreoffice.org/2398
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Michael Meeks michael.me...@suse.com
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f1b0eff..0c9db41 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1763,7 +1763,16 @@ namespace cppcanvas
rMF.Seek (next);
-length -= size;
+if (size = length)
+{
+length -= size;
+}
+else
+{
+SAL_WARN(cppcanvas, ImplRenderer::processEMFPlus:
+size sizelength length);
+length = 0;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - vcl/source
vcl/source/filter/wmf/emfwr.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 7c5b8e0d5c1af03270a29d6144e192d69cb06de5
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 25 13:22:07 2013 +0100
fdo#59405 fdo#60638: EMFWriter::ImplWrite: write EMF_PLUS comments
When editing the Visio OLE object, there is a preview file generated,
which is apparently an EMF file (strangely initially inserting the Visio
object seems to result in a totally unproblematic WMF file).
The EMF file apparently has almost its entire content stored in
MetaCommentAction of type EMF_PLUS, which is thrown away when writing
the file again.
Change-Id: I77a08454da673c1825aaa8421606737e7e8bc82c
(cherry picked from commit bf8450cfa2e9e899c716fbddadd7d5485aefe520)
Reviewed-on: https://gerrit.libreoffice.org/2396
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 4536979e19d6a9a913f677225a122c13a51da1fa)
Reviewed-on: https://gerrit.libreoffice.org/2400
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Tested-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index c4caf02..80d4573 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -1388,12 +1388,25 @@ void EMFWriter::ImplWrite( const GDIMetaFile rMtf )
break;
}
+case( META_COMMENT_ACTION ):
+{
+MetaCommentAction const*const pCommentAction(
+static_castMetaCommentAction const*(pAction));
+if (pCommentAction-GetComment() == EMF_PLUS)
+{
+ImplBeginCommentRecord(WIN_EMR_COMMENT_EMFPLUS);
+m_rStm.Write(pCommentAction-GetData(),
+ pCommentAction-GetDataSize());
+ImplEndCommentRecord();
+}
+}
+break;
+
case( META_MASK_ACTION ):
case( META_MASKSCALE_ACTION ):
case( META_MASKSCALEPART_ACTION ):
case( META_WALLPAPER_ACTION ):
case( META_TEXTLINE_ACTION ):
-case( META_COMMENT_ACTION ):
case( META_GRADIENTEX_ACTION ):
{
// !!! we don't want to support these actions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement
License statement: All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. regards, Ádám Csaba Király ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Fwd: license statement
Hi, Prashant Pandey píše v So 23. 02. 2013 v 19:19 +0530: Hi, Whenever I submit a patch to gerrit using 'git push origin localbranchname:refs/for/master', my patch is 'successfully' submitted but 'no' mail is circulated on this list regarding submission of my patches. I guess that you are talking about the commit https://gerrit.libreoffice.org/#/c/2303/ Hmm, I really do not see any mails about it on the mailing list. Norbert, do you have any idea, please? I have already sent a mail pertaining to 'license statement' (but have not got any confirmation mail yet !). I wish to know whether there is something more that I need to do or have I missed some procedural step that is creating this problem ? It should not be related to the licence statement. Anyway, thanks for sending the license statement. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ext/macromigration/dbmm_types.cxx |4 -
dbaccess/source/ext/macromigration/dbmm_types.hxx |2
dbaccess/source/ext/macromigration/docinteraction.cxx |4 -
dbaccess/source/ext/macromigration/docinteraction.hxx |4 -
dbaccess/source/ext/macromigration/macromigrationdialog.cxx |8 +--
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 18 +++---
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 14 ++---
dbaccess/source/ext/macromigration/macromigrationwizard.cxx |6 +-
dbaccess/source/ext/macromigration/migrationerror.hxx | 32 ++--
dbaccess/source/ext/macromigration/migrationlog.cxx | 24 -
dbaccess/source/ext/macromigration/migrationlog.hxx | 14 ++---
dbaccess/source/ext/macromigration/migrationprogress.hxx|6 +-
dbaccess/source/ext/macromigration/progresscapture.cxx | 10 +--
dbaccess/source/ext/macromigration/progresscapture.hxx |6 +-
14 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit 3252c5d4980016246417d0253749f37f1ed87a80
Author: Author: GergÅ Mocsi gmocs...@gmail.com
Date: Tue Feb 26 11:16:20 2013 +0100
fdo#38838, String to OUString in dbaccess/source/ext/macromigration
String to OUString applied in dbaccess/source/ext/macromigration module.
Also, RTL_CONSTASCII_USTRINGPARAM is removed from files, plus
::rtl::OUString replaced by OUString.
Change-Id: I31673c7d812992dbac675a5d7da5bf379c402a9c
Reviewed-on: https://gerrit.libreoffice.org/2379
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx
b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index 22f3eac..e275de6 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -32,7 +32,7 @@ namespace dbmm
//= helper
//
//
-String getScriptTypeDisplayName( const ScriptType _eType )
+OUString getScriptTypeDisplayName( const ScriptType _eType )
{
sal_uInt16 nResId( 0 );
@@ -46,7 +46,7 @@ namespace dbmm
case eDialog: nResId = STR_DIALOG;break;
}
OSL_ENSURE( nResId != 0, getScriptTypeDisplayName: illegal script
type! );
-return nResId ? String( MacroMigrationResId( nResId ) ) : String();
+return nResId ? OUString( MacroMigrationResId( nResId ) ) : OUString();
}
//
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx
b/dbaccess/source/ext/macromigration/dbmm_types.hxx
index 0792ec8..a8d0027 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx
@@ -52,7 +52,7 @@ namespace dbmm
//
//= helper
//
-String getScriptTypeDisplayName( const ScriptType _eType );
+OUString getScriptTypeDisplayName( const ScriptType _eType );
//
} // namespace dbmm
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx
b/dbaccess/source/ext/macromigration/docinteraction.cxx
index 9e21ef4..a83deb8 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -89,11 +89,11 @@ namespace dbmm
}
//
-bool InteractionHandler::requestDocumentPassword( const ::rtl::OUString
_rDocumentName, ::rtl::OUString _io_rPassword )
+bool InteractionHandler::requestDocumentPassword( const OUString
_rDocumentName, OUString _io_rPassword )
{
// create request
DocumentPasswordRequest aRequest(
-::rtl::OUString(), NULL,
+OUString(), NULL,
InteractionClassification_QUERY,
_io_rPassword.isEmpty() ? PasswordRequestMode_PASSWORD_ENTER :
PasswordRequestMode_PASSWORD_REENTER,
_rDocumentName
diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx
b/dbaccess/source/ext/macromigration/docinteraction.hxx
index 502a289..3291bca 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.hxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.hxx
@@ -63,8 +63,8 @@ namespace dbmm
if the user aborted the request.
*/
boolrequestDocumentPassword(
-const ::rtl::OUString _rDocumentName,
- ::rtl::OUString _io_rPassword
+const OUString
Re: Custom Widget question
On Tue, 2013-02-26 at 01:15 -0300, Olivier Hallot wrote: 1) On the Page format tab page there is a difference between pages formats for Writer+Calc and Draw. RID_SVXSTRARY_PAPERSIZE_STD and RID_SVXSTRARY_PAPERSIZE_DRAW (found in cui/source/tabpages/page.src) Can we swap ListStores used in ListBoxes through VCL? Hmm, at the moment anyway no, because the ListStores only exist as glue code in the builder, on the other hand what you can do is make *two* listboxes, each connected to a different liststore, set both to visible false and get + show the correct one in the dialog ctor, e.g. something like if (bDraw || bImpress) get(m_pListBox, drawpages) else get(m_pListBox, normalpages) m_pListBox-Show(); 2) Is there a special trick to make m_pWidget-Show(); m_pWidget-Hide(); work? Not sure what you mean ? Do you mean is it possible to set a widget in glade to invisible ?, then sure, common: set visible to No (and set No show all to No) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - vcl/source
vcl/source/filter/wmf/emfwr.cxx | 204 +++-
vcl/source/filter/wmf/emfwr.hxx | 12 ++
2 files changed, 215 insertions(+), 1 deletion(-)
New commits:
commit e8855a0a8ccb6be667053f78a25b70fa129c1f58
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Dec 6 12:21:24 2012 +0530
n#780748: Basic EMF+ implementation.
* Minimalistic implementation of EMF+ export
* Currently exports transparent polygons.
(cherry picked from commit f1fee2a65c8c1968798e1246a4b455d9160d8eb9)
Change-Id: I0c24c29b77c50f898fe1b8ce1904179292a1bb72
Reviewed-on: https://gerrit.libreoffice.org/2395
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 32bc874ded4f9108a32bd76a53ecc001e6ba2a83)
Reviewed-on: https://gerrit.libreoffice.org/2399
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 80d4573..cf8a748 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -130,6 +130,9 @@
#define WIN_SRCPAINT0x00EE0086L
#define WIN_SRCAND 0x008800C6L
#define WIN_SRCINVERT 0x00660046L
+#define WIN_EMR_COMMENT_EMFSPOOL0xL
+#define WIN_EMR_COMMENT_EMFPLUS 0x2B464D45L
+#define WIN_EMR_COMMENT_PUBLIC 0x43494447L
#define HANDLE_INVALID 0x
#define MAXHANDLES 65000
@@ -154,10 +157,194 @@
#define MM_ANISOTROPIC 8
+typedef enum
+{
+ EmfPlusHeader = 0x4001,
+ EmfPlusEndOfFile = 0x4002,
+ EmfPlusComment= 0x4003,
+ EmfPlusGetDC = 0x4004,
+ EmfPlusMultiFormatStart = 0x4005,
+ EmfPlusMultiFormatSection = 0x4006,
+ EmfPlusMultiFormatEnd = 0x4007,
+ EmfPlusObject = 0x4008,
+ EmfPlusClear = 0x4009,
+ EmfPlusFillRects = 0x400A,
+ EmfPlusDrawRects = 0x400B,
+ EmfPlusFillPolygon= 0x400C,
+ EmfPlusDrawLines = 0x400D,
+ EmfPlusFillEllipse= 0x400E,
+ EmfPlusDrawEllipse= 0x400F,
+ EmfPlusFillPie= 0x4010,
+ EmfPlusDrawPie= 0x4011,
+ EmfPlusDrawArc= 0x4012,
+ EmfPlusFillRegion = 0x4013,
+ EmfPlusFillPath = 0x4014,
+ EmfPlusDrawPath = 0x4015,
+ EmfPlusFillClosedCurve= 0x4016,
+ EmfPlusDrawClosedCurve= 0x4017,
+ EmfPlusDrawCurve = 0x4018,
+ EmfPlusDrawBeziers= 0x4019,
+ EmfPlusDrawImage = 0x401A,
+ EmfPlusDrawImagePoints= 0x401B,
+ EmfPlusDrawstring = 0x401C,
+ EmfPlusSetRenderingOrigin = 0x401D,
+ EmfPlusSetAntiAliasMode = 0x401E,
+ EmfPlusSetTextRenderingHint = 0x401F,
+ EmfPlusSetTextContrast= 0x4020,
+ EmfPlusSetInterpolationMode = 0x4021,
+ EmfPlusSetPixelOffsetMode = 0x4022,
+ EmfPlusSetCompositingMode = 0x4023,
+ EmfPlusSetCompositingQuality = 0x4024,
+ EmfPlusSave = 0x4025,
+ EmfPlusRestore= 0x4026,
+ EmfPlusBeginContainer = 0x4027,
+ EmfPlusBeginContainerNoParams = 0x4028,
+ EmfPlusEndContainer = 0x4029,
+ EmfPlusSetWorldTransform = 0x402A,
+ EmfPlusResetWorldTransform= 0x402B,
+ EmfPlusMultiplyWorldTransform = 0x402C,
+ EmfPlusTranslateWorldTransform= 0x402D,
+ EmfPlusScaleWorldTransform= 0x402E,
+ EmfPlusRotateWorldTransform = 0x402F,
+ EmfPlusSetPageTransform = 0x4030,
+ EmfPlusResetClip = 0x4031,
+ EmfPlusSetClipRect= 0x4032,
+ EmfPlusSetClipPath= 0x4033,
+ EmfPlusSetClipRegion = 0x4034,
+ EmfPlusOffsetClip = 0x4035,
+ EmfPlusDrawDriverstring = 0x4036,
+ EmfPlusStrokeFillPath = 0x4037,
+ EmfPlusSerializableObject = 0x4038,
+ EmfPlusSetTSGraphics = 0x4039,
+ EmfPlusSetTSClip = 0x403A
+} EmfPlusRecordType;
+
+
// -
// - EMFWriter -
// -
+void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType )
+{
+ImplBeginRecord( WIN_EMR_GDICOMMENT );
+m_rStm.SeekRel( 4 );
+m_rStm (sal_Int32) nCommentType;
+}
+
+void EMFWriter::ImplEndCommentRecord()
+{
+if( mbRecordOpen )
+{
+sal_Int32 nActPos = m_rStm.Tell();
+m_rStm.Seek( mnRecordPos + 8 );
+m_rStm (sal_uInt32)( nActPos -
[Libreoffice-commits] core.git: slideshow/test svx/source
slideshow/test/demoshow.cxx|2 +-
svx/source/dialog/svxruler.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0db25d61bc3c780be4baa00916696ca5976dea95
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Mon Feb 25 15:36:57 2013 -0300
String::CreateFromAscii removal
Change-Id: I86a33ef14b2bcdea1655db410f36d799689a1377
Reviewed-on: https://gerrit.libreoffice.org/2402
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 86f861c..11ce065 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -491,7 +491,7 @@ sal_uInt16 DemoApp::Exception( sal_uInt16 nError )
switch( nError EXC_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
-Abort( String::CreateFromAscii( Error: could not load language
resources.\nPlease check your installation.\n ) );
+Abort( Error: could not load language resources.\nPlease check
your installation.\n );
break;
}
return 0;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e9b3add..117642e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -166,7 +166,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char*
pDescription, const Stri
pParent = pParent-GetParent();
pDebugWindow = new RulerDebugWindow(pParent);
}
-String sContent(String::CreateFromAscii(pDescription));
+OUString sContent( OUString::createFromAscii(pDescription) );
sContent += rText;
sal_uInt16 nPos = pDebugWindow-GetLBox().InsertEntry(sContent);
pDebugWindow-GetLBox().SelectEntryPos(nPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 0d8169955a3ccfb314605c06a790919175d30de0 Author: Noel Power noel.po...@suse.com Date: Tue Feb 26 10:40:04 2013 + blind Android printf int/long wae Change-Id: I81a6767e8144336ed72f195cebb3764b4b741a32 diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 0c795c8..232a501 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -6013,13 +6013,13 @@ void Test::testAnchoredRotatedShape() CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRotRect.GetWidth(), aSnap.GetWidth(), TOLERANCE ) ); // ensure that anchor start and end addresses haven't changed -printf(expected startrow %d actual %d\n, aAnchor.maStart.Row(), pData-maStart.Row() ); +printf(expected startrow %ld actual %ld\n, (long)aAnchor.maStart.Row(), (long)pData-maStart.Row() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Row(), pData-maStart.Row() ); // start row 0 -printf(expected startcol %d actual %d\n, aAnchor.maStart.Col(), pData-maStart.Col() ); +printf(expected startcol %ld actual %ld\n, (long)aAnchor.maStart.Col(), (long)pData-maStart.Col() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Col(), pData-maStart.Col() ); // start column 5 -printf(expected endrow %d actual %d\n, aAnchor.maEnd.Row(), pData-maEnd.Row() ); +printf(expected endrow %ld actual %ld\n, (long)aAnchor.maEnd.Row(), (long)pData-maEnd.Row() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maEnd.Row(), pData-maEnd.Row() ); // end row 3 -printf(expected endcol %d actual %d\n, aAnchor.maEnd.Col(), pData-maEnd.Col() ); +printf(expected endcol %ld actual %ld\n, (long)aAnchor.maEnd.Col(), (long)pData-maEnd.Col() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maEnd.Col(), pData-maEnd.Col() ); // end col 7 } m_pDoc-DeleteTab(0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/svdraw/svdhdl.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9a4cef83c386199f740c85350da2bb53a7b3aa96
Author: Michael Meeks michael.me...@suse.com
Date: Mon Feb 25 21:48:33 2013 +
fdo#45879 - fix selected gluepoint rendering.
Store the glue-point bitmap at a unique index in maRealMarkers for re-use.
Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8
(cherry picked from commit 8d34984116c0841748ae47afa667877dc1b5a444)
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 020bb6a..9edebc2 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -87,11 +87,11 @@ public:
#define KIND_COUNT (14)
#define INDEX_COUNT (6)
-#define INDIVIDUAL_COUNT(4)
+#define INDIVIDUAL_COUNT(5)
SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
: maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
-// 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
+// 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
}
@@ -237,20 +237,20 @@ const BitmapEx
SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
case Glue_Deselected:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1,
Rectangle(Point(15, 67), Size(9, 9)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2,
Rectangle(Point(15, 67), Size(9, 9)));
}
case Anchor: // AnchorTR for SW
case AnchorTR:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2,
Rectangle(Point(24, 67), Size(24, 24)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3,
Rectangle(Point(24, 67), Size(24, 24)));
}
// add AnchorPressed to be able to animate anchor control
case AnchorPressed:
case AnchorPressedTR:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3,
Rectangle(Point(48, 67), Size(24, 24)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 4,
Rectangle(Point(48, 67), Size(24, 24)));
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 4-0, 4-0-1] fdo#59405 rregression: insert of Visio objects
Winfried Donkers píše v Út 26. 02. 2013 v 08:41 +0100: First of all: big kudo for Michael Stahl! Secondly, could it be possible to cherry-pick this to version 4.0.1 as well? I see this pushed in both 4-0 and 4-0-1 branches now. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source vcl/generic vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source writerfilter/inc writerfilter/source xmloff/inc xmloff/source
sw/inc/pch/precompiled_msword.hxx |2
sw/source/filter/ww8/docxattributeoutput.cxx | 21 ++--
sw/source/filter/ww8/docxattributeoutput.hxx |5
sw/source/filter/ww8/wrtw8sty.cxx |2
vcl/Library_vcl.mk|2
vcl/Package_inc.mk|2
vcl/generic/fontmanager/fontmanager.cxx |2
vcl/inc/vcl/embeddedfontshelper.hxx | 58 +++
vcl/inc/vcl/temporaryfonts.hxx| 54 --
vcl/source/app/svmain.cxx |6 -
vcl/source/gdi/embeddedfontshelper.cxx| 115 ++
vcl/source/gdi/temporaryfonts.cxx | 56 --
writerfilter/inc/pch/precompiled_writerfilter.hxx |2
writerfilter/source/dmapper/FontTable.cxx |6 -
xmloff/inc/pch/precompiled_xo.hxx |2
xmloff/source/style/XMLFontAutoStylePool.cxx | 13 +-
xmloff/source/style/XMLFontStylesContext.cxx |8 -
17 files changed, 214 insertions(+), 142 deletions(-)
New commits:
commit 788293959f53861de5bb32ade06870f494b0968d
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Feb 25 19:31:11 2013 +0100
put #ifdef around Unix specific code
Why do I still get surprised about things like code in vcl/generic/
not being generic at all?
Change-Id: I562e06fec0dc7b8ad0aacdba594921a8209d60ed
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index b5d1c01..c9f3bdf 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -11,10 +11,13 @@
#include osl/file.hxx
#include rtl/bootstrap.hxx
-#include vcl/fontmanager.hxx
#include vcl/svapp.hxx
#include vcl/outdev.hxx
+#if defined(UNX)
+#include vcl/fontmanager.hxx
+#endif
+
using namespace std;
void EmbeddedFontsHelper::clearTemporaryFontFiles()
@@ -60,6 +63,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString
familyName, FontFamil
FontWeight weight, FontPitch pitch, rtl_TextEncoding )
{
OUString url;
+#if defined(UNX)
psp::PrintFontManager mgr = psp::PrintFontManager::get();
list psp::fontID fontIds;
mgr.getFontList( fontIds );
@@ -98,6 +102,13 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString
familyName, FontFamil
}
}
}
+#else
+(void) familyName;
+(void) family;
+(void) italic;
+(void) weight;
+(void) pitch;
+#endif
return url;
}
commit 381154356c15128255e313f37641f0e50145f965
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Feb 21 13:43:44 2013 +0100
embed also system fonts when embedding fonts in a document
Without this, only fonts that had come embedded with the document
were embedded when saving, which meant that it was impossible
to create new documents that would have any fonts embedded.
Change-Id: I3b4e87b1b3ca5ae1ccfe29d9b571b0262c568dcf
diff --git a/sw/inc/pch/precompiled_msword.hxx
b/sw/inc/pch/precompiled_msword.hxx
index acacb8b..e05919f 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -252,7 +252,7 @@
#include vcl/outdev.hxx
#include vcl/salbtype.hxx
#include vcl/svapp.hxx
-#include vcl/temporaryfonts.hxx
+#include vcl/embeddedfontshelper.hxx
#include vcl/vclenum.hxx
#include vcl/virdev.hxx
#include vcl/wmf.hxx
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8a6e8bb..b7e211f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -98,7 +98,7 @@
#include txtinet.hxx
#include osl/file.hxx
-#include vcl/temporaryfonts.hxx
+#include vcl/embeddedfontshelper.hxx
#include com/sun/star/i18n/ScriptType.hpp
#include com/sun/star/chart2/XChartDocument.hpp
@@ -3055,14 +3055,14 @@ void DocxAttributeOutput::FontPitchType( FontPitch
ePitch ) const
FSEND );
}
-void DocxAttributeOutput::EmbedFont( const OUString name )
+void DocxAttributeOutput::EmbedFont( const OUString name, FontFamily family,
FontPitch pitch, rtl_TextEncoding encoding )
{
if( !m_rExport.pDoc-get( IDocumentSettingAccess::EMBED_FONTS ))
return; // no font embedding with this document
-EmbedFontStyle( name, XML_embedRegular, );
-EmbedFontStyle( name, XML_embedBold, b );
-EmbedFontStyle( name, XML_embedItalic, i );
-EmbedFontStyle( name, XML_embedBoldItalic, bi );
+EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE,
WEIGHT_NORMAL, pitch, encoding );
+EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD,
pitch, encoding );
+EmbedFontStyle( name, XML_embedItalic, family, ITALIC_NORMAL,
WEIGHT_NORMAL, pitch, encoding );
+EmbedFontStyle( name, XML_embedBoldItalic, family, ITALIC_NORMAL,
WEIGHT_BOLD, pitch, encoding );
}
static inline char
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - svx/source
svx/source/svdraw/svdhdl.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8c57b0322560f1f005ead9e43fb86f3bcbb0b365
Author: Michael Meeks michael.me...@suse.com
Date: Mon Feb 25 21:48:33 2013 +
fdo#45879 - fix selected gluepoint rendering.
Store the glue-point bitmap at a unique index in maRealMarkers for re-use.
Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8
(cherry picked from commit 8d34984116c0841748ae47afa667877dc1b5a444)
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 62c3aae..6c06d41 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -96,11 +96,11 @@ public:
#define KIND_COUNT (14)
#define INDEX_COUNT (6)
-#define INDIVIDUAL_COUNT(4)
+#define INDIVIDUAL_COUNT(5)
SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
: maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
-// 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
+// 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
}
@@ -246,20 +246,20 @@ const BitmapEx
SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
case Glue_Deselected:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1,
Rectangle(Point(15, 67), Size(9, 9)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2,
Rectangle(Point(15, 67), Size(9, 9)));
}
case Anchor: // AnchorTR for SW
case AnchorTR:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2,
Rectangle(Point(24, 67), Size(24, 24)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3,
Rectangle(Point(24, 67), Size(24, 24)));
}
// add AnchorPressed to be able to animate anchor control
case AnchorPressed:
case AnchorPressedTR:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3,
Rectangle(Point(48, 67), Size(24, 24)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 4,
Rectangle(Point(48, 67), Size(24, 24)));
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/CustomTarget_include.mk
odk/CustomTarget_include.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d50b7aceed892a273c12e0dbc7b0e00adbd27d43 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 11:47:48 2013 +0100 Fix sources of odk/CustomTarget_include copy actions Change-Id: I13fb1204675cb022709cad4d183aaf7a11f0ca4d diff --git a/odk/CustomTarget_include.mk b/odk/CustomTarget_include.mk index 08f10c4..8d1ee5a 100644 --- a/odk/CustomTarget_include.mk +++ b/odk/CustomTarget_include.mk @@ -30,7 +30,7 @@ odk_INCLIST := $(subst $(OUTDIR)/inc/,,$(shell find \ define odk_inc odkcommon_ZIPLIST += include/$(1) $(call gb_CustomTarget_get_target,odk/odkcommon/include): $(odk_WORKDIR)/include/$(1) -$(odk_WORKDIR)/include/$(1): $(foreach dir,$(odk_INCDIRLIST),$(call gb_Package_get_target,$(dir)_inc)) +$(odk_WORKDIR)/include/$(1): $(OUTDIR)/inc/$(1) mkdir -p $$(dir $$@) $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) cp $$ $$@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: BUG#55846 The font size and font name list doesnt appear in the vertical toolbar
On Tue, 2013-02-26 at 01:07 +0530, Janit Anjaria wrote:
I am hereby sending you the patch for review.
Your original patch is unfortunately quite badly mangled, you've
included...
a) a new file called
vcl/0001-New-table-dialog-from-impress-and-draw-converted-to-patch
which is surely an accidental pickup
b) a new file called vcl/source/window/toolbox2.cxx.save
which might be the desired result of modifying toolbox2.cxx or it might
be an older abandoned attempt accidentally picked up :-(
c) and your git name and email aren't set right
So, see http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup
to set your username and email correctly
On the basis that vcl/source/window/toolbox2.cxx.save is a modified
version of vcl/source/window/toolbox2.cxx with your real changes in
there I've sucked the attached patch out of the car crash which does
actually enable the comboboxes to appear in vertical toolbar mode which
is progress.
Catch is though that the font name and font style entries aren't
suitable for vertical toolbar mode so it would be a step backwards to
apply the attached patch. But I'm only guessing that this is your real
patch :-). If the patch you intended to send is different than the
attached try and re-submit it, but spend a few secs to scan through the
patch manually to make sure it looks like you expect.
C.
From 94e0198ab7dd76414d80620cbd3cb5f33e296326 Mon Sep 17 00:00:00 2001
From: Computer1 computer1@ubuntu.ubuntu-domain
Date: Tue, 26 Feb 2013 10:36:49 +
Subject: [PATCH] Resolves: fdo#55846 FontSize not displayed when the toolbar
is vertical
The font size and font name now appears in the vertical toolbar after making
changes in the code at toolbox.cxx and toolbox2.cxx
Change-Id: I71ee29ce607f912111f01515d9b2b918bb517e06
---
vcl/source/window/toolbox.cxx | 1 +
vcl/source/window/toolbox2.cxx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 2e7bddf..0477694 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1919,6 +1919,7 @@ sal_Bool ToolBox::ImplCalcItem()
if( it-mbVisibleText !mbHorz )
{
long tmp = it-maItemSize.Width();
+//fdo#55846 The UI for the same is managed by changing the snippet here.
it-maItemSize.Width() = it-maItemSize.Height();
it-maItemSize.Height() = tmp;
}
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 85f7ca9..cd0c608 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -222,7 +222,7 @@ Size ImplToolItem::GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWid
{
aSize = maItemSize;
-if ( mpWindow bHorz )
+if ( mpWindow )
{
// get size of item window and check if it fits
// no windows in vertical toolbars (the default is mbShowWindow=sal_False)
--
1.8.1.2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [PUSHED 4-0, 4-0-1] fdo#59405 rregression: insert of Visio objects
Hi Petr, Secondly, could it be possible to cherry-pick this to version 4.0.1 as well? I see this pushed in both 4-0 and 4-0-1 branches now. I noticed it too :) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] convert odk to gbuild and add to tail_build
On 02/25/2013 09:25 AM, Miklos Vajna wrote: On Sat, Feb 23, 2013 at 09:39:58PM +, Peter Foley (via Code Review) ger...@gerrit.libreoffice.org wrote: [build UNZ] CustomTarget/odk/odkcommon/java_src/juh_src.done [build UNZ] CustomTarget/odk/odkcommon/java_src/jurt_src.done [build ZIP] ridl_src [build ZIP] unoloader_src checkdir error: cannot create /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com File exists unable to process com/sun/star/comp/bridgefactory/BridgeFactory.java. checkdir error: cannot create /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com/sun/star File exists unable to process com/sun/star/comp/connections/Acceptor.java. checkdir error: cannot create /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com/sun/star/comp File exists unable to process com/sun/star/comp/connections/Connector.java. [build CPY] CustomTarget/odk/odkcommon/settings/settings.mk make[1]: *** [/home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/jurt_src.done] Error 2 make[1]: *** Waiting for unfinished jobs I've seen something like that right now with a make odk after a make odk.clean now, too. Calling make odk again succeeded. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/edtwin.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 61f467c8974d6b6face41e7027d75ae4ddb6fdb2 Author: Miklos Vajna vmik...@suse.cz Date: Tue Feb 26 11:48:22 2013 +0100 n#802888 SwEditWin: let fields have priority over header/footer flys http://people.freedesktop.org/~vmiklos/2013/watermark-field-click.odt is a reproducer, double-click was catched by the fly frame from the header, so the field edit dialog didn't appear. Change-Id: Ibd3ea382085fa4cbdc1af73d4be1e5c053a81eaa diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 73b9331..f9475d3 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2768,6 +2768,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) bool bOverFly = false; bool bPageAnchored = false; bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, eControl, bOverFly, bPageAnchored ); + +sal_Bool bIsDocReadOnly = rView.GetDocShell()-IsReadOnly(); +if (bOverHeaderFooterFly (!bIsDocReadOnly rSh.GetCurFld())) +// We have a field here, that should have priority over header/footer fly. +bOverHeaderFooterFly = false; + int nNbFlyClicks = 1; // !bOverHeaderFooterFly doesn't mean we have a frame to select if ( !bPageAnchored ( ( rSh.IsHeaderFooterEdit( ) !bOverHeaderFooterFly bOverFly ) || @@ -2864,7 +2870,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) // work but in practice ... rView.SelectShellForDrop(); -sal_Bool bIsDocReadOnly = rView.GetDocShell()-IsReadOnly(); bool bCallBase = true; if( pQuickHlpData-m_bIsDisplayed ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH 4-0-1: 1 review to go] Re: selected gluepoint fix ...
Hi Michael, all, Michael Meeks píše v Po 25. 02. 2013 v 21:55 +: A really silly snafu - storing two different image at the same index, thus breaking selected gluepoint rendering; I'd love to get it into 4.0.1 tomorrow if we can field the reviews - works nicely now. Thorsten gave his +1 by cherry-pick -s to the 4.0 branch, I give it one more :-) 1 to go for 4.0.1... All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sal/inc
sal/inc/rtl/string.hxx |4 ++--
sal/inc/rtl/ustring.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 44a400b40d2a0ee1e6babb2eda1e07baaee2ea16
Author: Eike Rathke er...@redhat.com
Date: Tue Feb 26 11:10:49 2013 +0100
SAL_WARN_UNUSED_RESULT OString copy
Change-Id: Iba2ee6f72c5d3fe35a22a6b2a6b42866fd8fb6fd
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 90544ac..9233823 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -1079,7 +1079,7 @@ public:
@param beginIndex the beginning index, inclusive.
@returnthe specified substring.
*/
-OString copy( sal_Int32 beginIndex ) const SAL_THROW(())
+SAL_WARN_UNUSED_RESULT OString copy( sal_Int32 beginIndex ) const
SAL_THROW(())
{
rtl_String *pNew = 0;
rtl_string_newFromSubString( pNew, pData, beginIndex, getLength() -
beginIndex );
@@ -1098,7 +1098,7 @@ public:
@param countthe number of characters.
@returnthe specified substring.
*/
-OString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(())
+SAL_WARN_UNUSED_RESULT OString copy( sal_Int32 beginIndex, sal_Int32 count
) const SAL_THROW(())
{
rtl_String *pNew = 0;
rtl_string_newFromSubString( pNew, pData, beginIndex, count );
commit fb0654442d01a928d099627d26999435e3c4c2f4
Author: Eike Rathke er...@redhat.com
Date: Tue Feb 26 11:09:54 2013 +0100
SAL_WARN_UNUSED_RESULT OUString copy
Change-Id: Ic511a4a399ae2d75de6050ac8e3f77ee13ec8275
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 1794bf4..848810c 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1440,7 +1440,7 @@ public:
@param beginIndex the beginning index, inclusive.
@returnthe specified substring.
*/
-OUString copy( sal_Int32 beginIndex ) const SAL_THROW(())
+SAL_WARN_UNUSED_RESULT OUString copy( sal_Int32 beginIndex ) const
SAL_THROW(())
{
rtl_uString *pNew = 0;
rtl_uString_newFromSubString( pNew, pData, beginIndex, getLength() -
beginIndex );
@@ -1459,7 +1459,7 @@ public:
@param countthe number of characters.
@returnthe specified substring.
*/
-OUString copy( sal_Int32 beginIndex, sal_Int32 count ) const SAL_THROW(())
+SAL_WARN_UNUSED_RESULT OUString copy( sal_Int32 beginIndex, sal_Int32
count ) const SAL_THROW(())
{
rtl_uString *pNew = 0;
rtl_uString_newFromSubString( pNew, pData, beginIndex, count );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/JoinTableView.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f48d1940554ec4bf49ba39eb5e5677d3cb639a97
Author: David Verrier dverr...@gmail.com
Date: Tue Feb 26 11:40:07 2013 +0100
German comment translated to English
Change-Id: I8f4686e89a068a4392cff013de31f429be88e2b9
Reviewed-on: https://gerrit.libreoffice.org/2423
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index e3f5288..7725bbf 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1078,7 +1078,7 @@ void OJoinTableView::ClearAll()
sal_Bool OJoinTableView::ScrollWhileDragging()
{
DBG_CHKTHIS(OJoinTableView,NULL);
-OSL_ENSURE(m_pDragWin != NULL, OJoinTableView::ScrollWhileDragging darf
nur waehrend Dragging eines Fensters aufgerufen werden !);
+OSL_ENSURE(m_pDragWin != NULL, OJoinTableView::ScrollWhileDragging must
not be called when a window is being dragged !);
// kill the timer
if (m_aDragScrollTimer.IsActive())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59405, which changed state. Bug 59405 Summary: [REGRESSION] Paste special and insert of Visio object: image invisible https://bugs.freedesktop.org/show_bug.cgi?id=59405 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
about documenting infrastructure
Hello, in the light of recent events, I want to to point everyone to the minutes at https://wiki.documentfoundation.org/Infra/Minutes_20121108, especially the paragraph about documentation. It did cost me days, if not weeks of time, to properly document things that have been previously undocumented, and the work still goes on. In other words, undocumented services eat up a lot of my time, time that right now would be despearately needed for migrating the next server. However, in order to do so, I need to know what and how to migrate. Please, everyone, and I can't emphasize that enough, please do properly document all services you run, all changes you do, and mail this documentation to the admin team at hostmas...@documentfoundation.org. This is by no means mant to annoy anyone, but rather is needed for a growing infrastructure as we run it these days. Be advised that the infra team *WILL* remove undocumented services in the future, even if these are production ones already. And we will *NOT* care if these are desperately needed. If this is the only way to enforce getting documentation, we will do so. No documentation, no service. If you run crucial services, it is also crucial that you do document them. We are happy to help, but without your input, this won't work. Two concrete examples (out of many) to show how we can effectively kill our own infrastructure due to lack of documentation: - From what I know, there are still pieces from gerrit documentation missing. Soon, we may need to completely setup the VM again - if pieces are missing then, nobody can guarantee gerrit will run as it does today. - I am now having a hard time documenting MirrorBrain. We thought we had documented everything in the past, but then, I stumbled across some settings hidden in various places. If I were to migrate without those settings, the LibreOffice download server, at least it's statistics, would effectively be killed. Sorry for whining out loud, but the whole migration process did take probably three to five times longer already, as it would have taken with proper documentation. Happy hacking, and looking forward to your docs ;-) Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 60306, which changed state. Bug 60306 Summary: EDITING: CONDITIONAL FORMATTING destroyed after copy-paste cell https://bugs.freedesktop.org/show_bug.cgi?id=60306 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - reportdesign/source vcl/source
reportdesign/source/ui/inspection/GeometryHandler.cxx |2 +-
vcl/source/fontsubset/sft.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 24262b7cfe6607576a38e661553b56596d6164b4
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Feb 26 12:13:41 2013 +0100
Don't abort when myPoints is empty
Change-Id: I6bbb2a1cce1c89b94d027acf94fd712706bff422
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 3e41baf..e110c12 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -752,7 +752,8 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf,
sal_uInt32 glyphID, ControlPo
pa = (ControlPoint*)calloc(np, sizeof(ControlPoint));
assert(pa != 0);
-memcpy( pa, myPoints[0], np*sizeof(ControlPoint) );
+if (np 0)
+memcpy( pa, myPoints[0], np*sizeof(ControlPoint) );
*pointArray = pa;
return np;
commit 62061df8964692c4fd14b4b5fd28b1490820c177
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Feb 22 16:30:03 2013 +0100
Compare strings with proper length
Change-Id: If88f79a7f63edb254ad5356e9a0fccc5573af106
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 90d10be..97b946b 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1431,7 +1431,7 @@ inspection::InteractiveSelectionResult SAL_CALL
GeometryHandler::onInteractivePr
}
else if ( PropertyName.equalsAsciiL(PROPERTY_FORMULA.ascii,
PROPERTY_FORMULA.length)
|| PropertyName.equalsAsciiL(PROPERTY_INITIALFORMULA.ascii,
PROPERTY_INITIALFORMULA.length)
-|| PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii,
PROPERTY_INITIALFORMULA.length)
+|| PropertyName.equalsAsciiL(PROPERTY_DATAFIELD.ascii,
PROPERTY_DATAFIELD.length)
||
PropertyName.equalsAsciiL(PROPERTY_CONDITIONALPRINTEXPRESSION.ascii,
PROPERTY_CONDITIONALPRINTEXPRESSION.length))
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: about documenting infrastructure
On 2013-02-26 13:06, Florian Effenberger wrote: mail this documentation to the admin team at hostmas...@documentfoundation.org. Using somewhere on the DocumentationFoundation wiki to document this might be friendlier to maintain, and easier to update since you don't have to guess what it is already documented. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - svtools/inc
svtools/inc/svtools/transfer.hxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 7da28b1cc0953e8d67248235f0eeac2abf140fe3
Author: Michael Stahl mst...@redhat.com
Date: Mon Feb 25 13:11:04 2013 +0100
fdo#59405: initialize members of TransferableObjectDescriptor
The mnViewAspect member is otherwise only initialized if a
SOT_FORMATSTR_ID_OBJECTDESCRIPTOR thingy is in the clipboard, which only
happens if the clipboard source is OOo/LO.
When inserting an OLE object, the value MSOLE_CONTENT apparently results
in requesting the current size from the OLE object, which looks much
better than the square default.
Change-Id: I8c7fb80a8ae88272f1ecaf3a375bef5d917f2a5b
(cherry picked from commit 0cf6433117477642897fb2d874a4353eff8a1f35)
Reviewed-on: https://gerrit.libreoffice.org/2393
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit a724fb43d8540687e33d75c90660250e5308585d)
Reviewed-on: https://gerrit.libreoffice.org/2397
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 25c0d52..93dab75 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -37,6 +37,7 @@
#include com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp
#include com/sun/star/datatransfer/dnd/XDragSourceListener.hpp
#include com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
+#include com/sun/star/embed/Aspects.hpp
#include com/sun/star/io/XInputStream.hpp
//
@@ -82,6 +83,12 @@ struct TransferableObjectDescriptor
String maDisplayName;
sal_BoolmbCanLink;
+TransferableObjectDescriptor()
+: mnViewAspect(::com::sun::star::embed::Aspects::MSOLE_CONTENT)
+, mnOle2Misc(0)
+, mbCanLink(false)
+{}
+
SVT_DLLPUBLIC friend SvStream operator( SvStream rIStm,
TransferableObjectDescriptor rObjDesc );
SVT_DLLPUBLIC friend SvStream operator( SvStream rOStm, const
TransferableObjectDescriptor rObjDesc );
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 60311, which changed state. Bug 60311 Summary: EDITING: Copy cells with CONDITIONAL FORMATTING formula with wrong references after paste https://bugs.freedesktop.org/show_bug.cgi?id=60311 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/sortcriteriapage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 7cbf638498f9fb07e9329d59a934411be7cd444a Author: Joren De Cuyper joren.libreoff...@telenet.be Date: Tue Feb 19 23:47:32 2013 +0100 Only show scrollbar of sortcriteriapage.ui if necessary Change-Id: I9098dc28f41f9603c8f736e970f0efd6a9178f7c Reviewed-on: https://gerrit.libreoffice.org/2276 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/sortcriteriapage.ui b/sc/uiconfig/scalc/ui/sortcriteriapage.ui index 39e3a21..6b92021 100644 --- a/sc/uiconfig/scalc/ui/sortcriteriapage.ui +++ b/sc/uiconfig/scalc/ui/sortcriteriapage.ui @@ -7,7 +7,6 @@ property name=hexpandTrue/property property name=vexpandTrue/property property name=hscrollbar_policynever/property -property name=vscrollbar_policyalways/property property name=shadow_typein/property child object class=GtkBox id=SortKeyWindow ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++ extensions requiring LIBO_UDK_4.1
On 02/22/2013 04:30 PM, Michael Stahl wrote: On 22/02/13 15:53, Alexander Thurgood wrote: All I know is that the new gbuild one doesn't work on other people's systems, as I have made the connector available for download from my Dropbox account (both 32bit and 64bit Linux versions) for testing purposes. It works on my own dev-install build. it's possible that this is because it requires functions that were added after the 4.0 release on master (i suspect this happens automatically due to some OUString changes); for example here i'm getting a dependency on LIBO_UDK_4.1 symbol version, which none of the current releases supply. readelf --version-info /work/lo/master/solver/unxlngx6/lib/mysqlc.uno.so | grep LIBO_UDK 01c: a (LIBO_UDK_3.6) 4 (UDK_3_0_0) 2 (UDK_3_0_0) 4 (UDK_3_0_0) 08c: 12 (LIBO_UDK_4.1) 7 (UDK_3_0_0) 4 (UDK_3_0_0) b (CXXABI_1.3) 0x0030: Name: LIBO_UDK_4.1 Flags: none Version: 18 0x0060: Name: LIBO_UDK_3.6 Flags: none Version: 10 i'm not sure if this affects only extensions built with LO build system or also those build with ODK. As always, the best advice if you want something that works back with an old version is to build it against that old version's source resp. SDK. That said, one gotcha indeed is that even if you do not use any new functionality, just recompiling C++ sources in a recent LO build can introduce dependencies on new symbols. One example is an expression s1 + s2 with two OUString instances, which now goes via inline OUStringConcat and an inline OUString(OUStringConcat const ) ctor that calls rtl_uString_alloc that is new with LIBO_UDK_4.1, i.e., LO 4.1. The good news, at least for that example and at least for now, is that all that new functionality is conditional on RTL_FAST_STRING, which is not (yet?) set when building against the SDK. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source
vcl/source/fontsubset/sft.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit e99ba6c7ed32b97112df174c8986ca2ced919f68 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 26 12:13:41 2013 +0100 Don't abort when myPoints is empty Change-Id: I6bbb2a1cce1c89b94d027acf94fd712706bff422 Reviewed-on: https://gerrit.libreoffice.org/2425 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 3e41baf..e110c12 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -752,7 +752,8 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPo pa = (ControlPoint*)calloc(np, sizeof(ControlPoint)); assert(pa != 0); -memcpy( pa, myPoints[0], np*sizeof(ControlPoint) ); +if (np 0) +memcpy( pa, myPoints[0], np*sizeof(ControlPoint) ); *pointArray = pa; return np; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Document filters for Palm and PocketPC, xmerge module
Hi, While reviewing Windows installer code, I stumbled upon Java filters for mobile devices. Their registration was broken for a long time, nevertheless nobody complained. These filters are for Palm and Pocket PC office software, AportisDoc, PocketWord and PocketExcel. They are not part of the default LibreOffice installation on Windows. I wonder, if someone out there is using them. Source lives in xmerge module. There I found many useless code. * xmerge\source\activesync\ - ActiveSync 3.5 support, not built, a pre-built DLL is delivered to solver and packaged. It is not registered. Registration fails on Windows 7, The module xmergesync.dll was loaded but the call to DllRegisterServer failed with error code 0x80070002. * xmerge\source\htmlsoff\ - delivered to solver but not packaged * xmerge\source\minicalc\ - filter for MiniCalc format (Palm), not built, not packaged * xmerge\source\regutil\ - not built, not delivered. I wonder why they needed this at all, stock regsvr32.exe has the same functionality. * xmerge\source\wordsmith\ - a filter for WordSmith format (whatever it is), not built, not packaged XMerge framework (see http://www.openoffice.org/xml/xmerge/) is not entirely useless, a LaTeX ans XHTML export filter extension uses it (http://writer2latex.sourceforge.net/). Before I spend more time on fixing registration of these components under Windows, I would like to know, if you see a future for this xmerge platform and for existing filters in particular. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/ui/docvw/edtwin.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bb850eead3dd2883343029a863368360e03fcfee Author: Miklos Vajna vmik...@suse.cz Date: Tue Feb 26 11:48:22 2013 +0100 n#802888 SwEditWin: let fields have priority over header/footer flys http://people.freedesktop.org/~vmiklos/2013/watermark-field-click.odt is a reproducer, double-click was catched by the fly frame from the header, so the field edit dialog didn't appear. (cherry picked from commit 61f467c8974d6b6face41e7027d75ae4ddb6fdb2) Conflicts: sw/source/ui/docvw/edtwin.cxx Change-Id: Ibd3ea382085fa4cbdc1af73d4be1e5c053a81eaa diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 712b31f..36db795 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2731,7 +2731,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) } } -if ( lcl_CheckHeaderFooterClick( rSh, aDocPos, rMEvt.GetClicks() ) ) +sal_Bool bIsDocReadOnly = rView.GetDocShell()-IsReadOnly(); +if ( (bIsDocReadOnly || !rSh.GetCurFld()) lcl_CheckHeaderFooterClick( rSh, aDocPos, rMEvt.GetClicks() ) ) return; @@ -2750,7 +2751,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) // work but in practice ... lcl_SelectShellForDrop( rView ); -sal_Bool bIsDocReadOnly = rView.GetDocShell()-IsReadOnly(); sal_Bool bCallBase = sal_True; if( pQuickHlpData-bClear ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: general question: code analysis
Hi Hamza, On Tue, 2013-02-26 at 12:32 +0100, hamza abdelkebir wrote: Does LibreOffice use any code analysis tool like sonar? Not quite like sonar no. Various heroic contributors run various lint tools: cppcheck, lyda, coverity, and others and improve the code based on their results :-) do you think it's worth using for the project? In general we have quite a long list of such lint problems to tackle (I think), which brings an immediate, incremental benefit to the code. If you think setting the tool up is the first step to doing something about the results ;-) then I'd say go for it ... the more linting / analysis we have the better. I don't expect terribly high scores though ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - formula/source
formula/source/core/api/FormulaCompiler.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d8ae8130759119fe5e1a184bab5a06d469a8689a Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Feb 25 08:09:43 2013 +0100 ocMacro and ocExternal need to be recalculated on load, fdo#60977 Change-Id: I9e69ca2feae44bc645e8a49e349557f0933a23eb Reviewed-on: https://gerrit.libreoffice.org/2413 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-on: https://gerrit.libreoffice.org/2417 Reviewed-by: Michael Meeks michael.me...@suse.com Reviewed-by: Jan Holesovsky ke...@suse.cz Tested-by: Jan Holesovsky ke...@suse.cz diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 468ecd3..16b3fd5 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1061,6 +1061,9 @@ void FormulaCompiler::Factor() // Don't use SetRecalcModeOnLoad() which would override // ModeAlways. case ocConvert : +case ocDde: +case ocMacro: +case ocExternal: pArr-AddRecalcMode( RECALCMODE_ONLOAD ); break; // If the referred cell is moved the value changes. @@ -1080,9 +1083,6 @@ void FormulaCompiler::Factor() pArr-AddRecalcMode( RECALCMODE_ONLOAD ); pArr-SetHyperLink(true); break; -case ocDde: -pArr-AddRecalcMode( RECALCMODE_ONLOAD ); -break; default: ; // nothing } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] convert odk to gbuild and add to tail_build
I can't reproduce this. It might be a parallelism issue. What -j option are you using? Peter On Mon, Feb 25, 2013 at 3:25 AM, Miklos Vajna vmik...@suse.cz wrote: On Sat, Feb 23, 2013 at 09:39:58PM +, Peter Foley (via Code Review) ger...@gerrit.libreoffice.org wrote: Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2288 This patch just caused this here: [build PKG] l10ntools_inc [build UPK] 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 [build UPK] f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip [build UPK] 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip [build UPK] 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz [build UPK] 0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz [build UPK] e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip [build UPK] 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz [build UPK] c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz [build UPK] 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz [build UPK] 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz [build UPK] ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz [build MOD] nss [build UNZ] CustomTarget/odk/odkcommon/java_src/juh_src.done [build UNZ] CustomTarget/odk/odkcommon/java_src/jurt_src.done [build ZIP] ridl_src [build ZIP] unoloader_src checkdir error: cannot create /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com File exists unable to process com/sun/star/comp/bridgefactory/BridgeFactory.java. checkdir error: cannot create /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com/sun/star File exists unable to process com/sun/star/comp/connections/Acceptor.java. checkdir error: cannot create /home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/com/sun/star/comp File exists unable to process com/sun/star/comp/connections/Connector.java. [build CPY] CustomTarget/odk/odkcommon/settings/settings.mk make[1]: *** [/home/vmiklos/git/libreoffice/master/workdir/unxlngx6.pro/CustomTarget/odk/odkcommon/java_src/jurt_src.done] Error 2 make[1]: *** Waiting for unfinished jobs This was a clean build: git pull -r ./autogen.sh make clean make Let me know if I should share a full log. (I could work it around by using 'make odk.clean make odk.all make'.) ___ 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] core.git: Branch 'libreoffice-4-0-1' - sc/source
sc/source/ui/condformat/condformatdlgentry.cxx | 46 ++---
1 file changed, 27 insertions(+), 19 deletions(-)
New commits:
commit c60860b966aba025d7e88422b172faefd007a945
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 19 19:18:35 2013 +0100
respect local number format in cond format dlg, fdo#60574
Change-Id: Iec185ac6c6447176731619249cdda4457f1bb8a3
Reviewed-on: https://gerrit.libreoffice.org/2411
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-on: https://gerrit.libreoffice.org/2420
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index f750ed5..7039781 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -582,7 +582,7 @@ void ScFormulaFrmtEntry::SetInactive()
namespace {
-void SetColorScaleEntryTypes( const ScColorScaleEntry rEntry, ListBox
rLbType, Edit rEdit, ColorListBox rLbCol )
+void SetColorScaleEntryTypes( const ScColorScaleEntry rEntry, ListBox
rLbType, Edit rEdit, ColorListBox rLbCol, ScDocument* pDoc )
{
// entry Automatic is not available for color scales
sal_Int32 nIndex = static_castsal_Int32(rEntry.GetType());
@@ -596,7 +596,13 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry
rEntry, ListBox rLbType,
case COLORSCALE_PERCENTILE:
case COLORSCALE_VALUE:
case COLORSCALE_PERCENT:
-rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue()));
+{
+double nVal = rEntry.GetValue();
+SvNumberFormatter* pNumberFormatter = pDoc-GetFormatTable();
+rtl::OUString aText;
+pNumberFormatter-GetInputLineString(nVal, 0, aText);
+rEdit.SetText(aText);
+}
break;
case COLORSCALE_FORMULA:
rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT));
@@ -672,9 +678,9 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window*
pParent, ScDocument* pDo
if(pFormat)
{
ScColorScaleFormat::const_iterator itr = pFormat-begin();
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin,
pDoc);
++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax,
pDoc);
}
else
{
@@ -825,12 +831,12 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window*
pParent, ScDocument* pDo
if(pFormat)
{
ScColorScaleFormat::const_iterator itr = pFormat-begin();
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin,
pDoc);
assert(pFormat-size() == 3);
++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle,
maLbColMiddle);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle,
maLbColMiddle, pDoc);
++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax,
pDoc);
}
else
{
@@ -1007,7 +1013,7 @@ IMPL_LINK_NOARG( ScConditionFrmtEntry,
ConditionTypeSelectHdl )
namespace {
-void SetDataBarEntryTypes( const ScColorScaleEntry rEntry, ListBox rLbType,
Edit rEdit )
+void SetDataBarEntryTypes( const ScColorScaleEntry rEntry, ListBox rLbType,
Edit rEdit, ScDocument* pDoc )
{
rLbType.SelectEntryPos(rEntry.GetType());
switch(rEntry.GetType())
@@ -1016,18 +1022,20 @@ void SetDataBarEntryTypes( const ScColorScaleEntry
rEntry, ListBox rLbType, Ed
case COLORSCALE_MIN:
case COLORSCALE_MAX:
break;
-case COLORSCALE_PERCENTILE:
-rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue()));
-break;
+case COLORSCALE_VALUE:
case COLORSCALE_PERCENT:
-rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue()));
+case COLORSCALE_PERCENTILE:
+{
+double nVal = rEntry.GetValue();
+SvNumberFormatter* pNumberFormatter = pDoc-GetFormatTable();
+rtl::OUString aText;
+pNumberFormatter-GetInputLineString(nVal, 0, aText);
+rEdit.SetText(aText);
+}
break;
case COLORSCALE_FORMULA:
rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT));
break;
-case COLORSCALE_VALUE:
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - svx/source
svx/source/svdraw/svdhdl.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 37b7289a84b0cc0f84e099129135556d89b953fc
Author: Michael Meeks michael.me...@suse.com
Date: Mon Feb 25 21:48:33 2013 +
fdo#45879 - fix selected gluepoint rendering.
Store the glue-point bitmap at a unique index in maRealMarkers for re-use.
(cherry picked from commit 8d34984116c0841748ae47afa667877dc1b5a444)
Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8
Signed-off-by: Thorsten Behrens tbehr...@suse.com
Reviewed-on: https://gerrit.libreoffice.org/2424
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 020bb6a..9edebc2 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -87,11 +87,11 @@ public:
#define KIND_COUNT (14)
#define INDEX_COUNT (6)
-#define INDIVIDUAL_COUNT(4)
+#define INDIVIDUAL_COUNT(5)
SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
: maMarkersBitmap(ResId(nResId, *ImpGetResMgr())),
-// 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
+// 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
}
@@ -237,20 +237,20 @@ const BitmapEx
SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
case Glue_Deselected:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1,
Rectangle(Point(15, 67), Size(9, 9)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2,
Rectangle(Point(15, 67), Size(9, 9)));
}
case Anchor: // AnchorTR for SW
case AnchorTR:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2,
Rectangle(Point(24, 67), Size(24, 24)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3,
Rectangle(Point(24, 67), Size(24, 24)));
}
// add AnchorPressed to be able to animate anchor control
case AnchorPressed:
case AnchorPressedTR:
{
-return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3,
Rectangle(Point(48, 67), Size(24, 24)));
+return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 4,
Rectangle(Point(48, 67), Size(24, 24)));
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/filters-test.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 13330bd6e33d1ca3b470740b5360e2756f06a7a4 Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 26 14:20:06 2013 +0200 WaE: int/SCROW format mismatch Change-Id: If33637df7f175f3f4248093034849177da681117 diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 19ad9fb..4393386 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -357,11 +357,11 @@ void impl_testLegacyCellAnchoredRotatedShape( ScDocument* pDoc, Rectangle aRect ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj ); -printf(expected startrow %d actual %d\n, aAnchor.maStart.Row(), pData-maStart.Row() ); +printf(expected startrow % SAL_PRIdINT32 actual % SAL_PRIdINT32 \n, aAnchor.maStart.Row(), pData-maStart.Row() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Row(), pData-maStart.Row() ); printf(expected startcol %d actual %d\n, aAnchor.maStart.Col(), pData-maStart.Col() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maStart.Col(), pData-maStart.Col() ); -printf(expected endrow %d actual %d\n, aAnchor.maEnd.Row(), pData-maEnd.Row() ); +printf(expected endrow % SAL_PRIdINT32 actual % SAL_PRIdINT32 \n, aAnchor.maEnd.Row(), pData-maEnd.Row() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maEnd.Row(), pData-maEnd.Row() ); printf(expected endcol %d actual %d\n, aAnchor.maEnd.Col(), pData-maEnd.Col() ); CPPUNIT_ASSERT_EQUAL( aAnchor.maEnd.Col(), pData-maEnd.Col() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |6 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 20a6cc79a2fc7dd302871081a8f5be568a74ab89 Author: Andras Timar ati...@suse.com Date: Tue Feb 26 13:21:11 2013 +0100 Bump for 3.6-12 Change-Id: Ia395e835f4366bd71e3c93b8ac077c5486dce47f diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index bb8d44a..4847b01 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-311 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-312 BASEPRODUCTVERSION 3.6 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -110,7 +110,7 @@ LibreOffice_Dev BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-311 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-312 BASEPRODUCTVERSION 3.6 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -380,7 +380,7 @@ OxygenOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-311 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-312 BASEPRODUCTVERSION 3.6 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 52fa8f8..ad5cc96 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=360 -RSCREVISION=360m1(Build:311) -BUILD=311 +RSCREVISION=360m1(Build:312) +BUILD=312 LAST_MINOR=m1 SOURCEVERSION=OOO360 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/embeddedfontshelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e3ee49a91bdace7f41364e5dee966ca044f2f51
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Feb 26 13:23:26 2013 +0100
another attempt at fixing build with the generic PrintFontManager
Change-Id: I2499e57cd3e885594a9c836fabc3b6229c4a34c3
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index c9f3bdf..b063d7d 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -14,7 +14,7 @@
#include vcl/svapp.hxx
#include vcl/outdev.hxx
-#if defined(UNX)
+#if defined(UNX) !defined(MACOSX)
#include vcl/fontmanager.hxx
#endif
@@ -63,7 +63,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString
familyName, FontFamil
FontWeight weight, FontPitch pitch, rtl_TextEncoding )
{
OUString url;
-#if defined(UNX)
+#if defined(UNX) !defined(MACOSX)
psp::PrintFontManager mgr = psp::PrintFontManager::get();
list psp::fontID fontIds;
mgr.getFontList( fontIds );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED 4-0-1] Re: selected gluepoint fix ...
Hi, Thorsten Behrens píše v Út 26. 02. 2013 v 11:58 +0100: https://gerrit.libreoffice.org/#/c/2424/ Indeed one more missing for 4.0.1 Just for the record, Petr's +1 was the last one, pushed now. Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - editeng/source
editeng/source/editeng/impedit3.cxx | 64 +++-
1 file changed, 35 insertions(+), 29 deletions(-)
New commits:
commit 1071c81719e7113ce5699be989596bbed59c5b18
Author: Armin Le Grand a...@apache.org
Date: Fri Jun 8 09:24:39 2012 +
Fix i#119756 Safer take care of empty paragraphs in EditEngine layouting
This fixes fdo#59629 on our side.
Conflicts:
editeng/source/editeng/impedit3.cxx
and moved sal_uInt16 nIndex back up in scope.
(cherry picked from commit b57cb5326713da9e926bb2ad5a56dce90ac00a87)
Change-Id: Ie2b5dac48b10ff8c031f481f0a7ddde644694975
Signed-off-by: Thorsten Behrens tbehr...@suse.com
Reviewed-on: https://gerrit.libreoffice.org/2405
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 098fd92..b45c826 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2880,6 +2880,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
pPDFExtOutDevData-BeginStructureElement(
vcl::PDFWriter::Paragraph );
long nParaHeight = pPortion-GetHeight();
+sal_uInt16 nIndex = 0;
if ( pPortion-IsVisible() (
( !IsVertical() ( ( aStartPos.Y() + nParaHeight )
aClipRec.Top() ) ) ||
( IsVertical() ( ( aStartPos.X() - nParaHeight )
aClipRec.Right() ) ) ) )
@@ -2891,6 +2892,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
sal_uInt16 nLines = pPortion-GetLines().Count();
sal_uInt16 nLastLine = nLines-1;
+// #108052#
+bool bEndOfParagraphWritten(false);
+
if ( !IsVertical() )
aStartPos.Y() += pPortion-GetFirstLineOffset();
else
@@ -2901,9 +2905,12 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
const SvxLineSpacingItem rLSItem = ((const
SvxLineSpacingItem)pPortion-GetNode()-GetContentAttribs().GetItem(
EE_PARA_SBL ));
sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() ==
SVX_INTER_LINE_SPACE_FIX )
? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
+bool bPaintBullet (false);
+
for ( sal_uInt16 nLine = 0; nLine nLines; nLine++ )
{
pLine = pPortion-GetLines()[nLine];
+nIndex = pLine-GetStart();
DBG_ASSERT( pLine, NULL-Pointer in the line iterator in
UpdateViews );
aTmpPos = aStartPos;
if ( !IsVertical() )
@@ -2926,7 +2933,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
if ( ( !IsVertical() ( aStartPos.Y() aClipRec.Top() ) )
|| ( IsVertical() aStartPos.X() aClipRec.Right() ) )
{
-bool bPaintBullet (false);
+bPaintBullet = false;
// Why not just also call when stripping portions? This
will give the correct values
// and needs no position corrections in
OutlinerEditEng::DrawingText which tries to call
@@ -2945,37 +2952,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
// --
// Over the Portions of the line ...
// --
-sal_uInt16 nIndex = pLine-GetStart();
bool bParsingFields = false;
::std::vector sal_Int32 ::iterator itSubLines;
-// #i108052# When stripping a callback for empty
paragraphs is needed. This
-// was somehow lost/removed/killed by making the
TextPortions with empty
-// paragraph to type PORTIONKIND_TAB instead of
PORTIONKIND_TEXT. Adding here
-
- // since I could not find out who and
why this has
- // changed.
-// #i118881#: Do not include the empty paragraph
-// after a bullet. Otherwise the wrong paragraph
-// indices will eventually find their way into
-// metafiles and break the association between
-// paragraphs and Impress animations.
- if(!bPaintBullet bStripOnly
pLine-GetStartPortion() == pLine-GetEndPortion())
-{
-const Color
aOverlineColor(pOutDev-GetOverlineColor());
-const Color
[Libreoffice-commits] core.git: 3 commits - cui/source helpcontent2 sc/source svx/inc sw/source
cui/source/dialogs/postdlg.cxx| 10 +-
cui/source/factory/dlgfact.cxx|4 ++--
cui/source/factory/dlgfact.hxx|2 +-
cui/source/inc/helpid.hrc |4
cui/source/inc/postdlg.hxx|4 +---
helpcontent2 |2 +-
sc/source/ui/dbgui/sortkeydlg.cxx | 17 -
sc/source/ui/inc/sortkeydlg.hxx |2 ++
sc/source/ui/miscdlgs/redcom.cxx |2 +-
svx/inc/svx/svxdlg.hxx|2 +-
sw/source/ui/shells/textfld.cxx |2 +-
11 files changed, 27 insertions(+), 24 deletions(-)
New commits:
commit 07c584ad8ce44cc6fe098a177c8b07e6cfc7881e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 26 12:26:25 2013 +
postit dialog is always used for redline comments now
Change-Id: Id3ec1c12c354aabf2556e91e4fa75d60bb2c0f3c
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 7fbf2e7..cec8c01 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -41,7 +41,7 @@
// class SvxPostItDialog -
SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet rCoreSet,
-bool bPrevNext, bool bRedline)
+bool bPrevNext)
: SfxModalDialog(pParent, CommentDialog, cui/ui/comment.ui)
, rSet(rCoreSet)
, pOutSet(0)
@@ -54,14 +54,6 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const
SfxItemSet rCoreSet,
get(m_pNextBtn, next);
get(m_pEditED, edit);
-if (bRedline) // HelpIDs for redlining
-{
-SetHelpId(HID_REDLINING_DLG);
-m_pEditED-SetHelpId(HID_REDLINING_EDIT);
-m_pPrevBtn-SetHelpId(HID_REDLINING_PREV);
-m_pNextBtn-SetHelpId(HID_REDLINING_NEXT);
-}
-
m_pPrevBtn-SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) );
m_pNextBtn-SetClickHdl( LINK( this, SvxPostItDialog, NextHdl ) );
m_pAuthorBtn-SetClickHdl( LINK( this, SvxPostItDialog, Stamp ) );
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e63292e..dfe6cce 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1665,9 +1665,9 @@ SfxAbstractDialog*
AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog(
Window* pParent,
const
SfxItemSet rCoreSet,
-
sal_Bool bPrevNext, sal_Bool bRedline )
+
sal_Bool bPrevNext )
{
-SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext,
bRedline );
+SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext
);
return new AbstractSvxPostItDialog_Impl( pDlg );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 539dfe1..e8211f8 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -742,7 +742,7 @@ public:
sal_Bool
bHasObj = sal_True );
virtual AbstractSvxPostItDialog*CreateSvxPostItDialog( Window*
pParent, //add for SvxPostItDialog
const
SfxItemSet rCoreSet,
-
sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False );
+
sal_Bool bPrevNext = sal_False );
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId
);
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c62a335..8f26261 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -258,10 +258,6 @@
#define HID_PAGE_MEASURE CUI_HID_PAGE_MEASURE
#define HID_MEASURE_CTL_POSITION CUI_HID_MEASURE_CTL_POSITION
#define HID_FORMAT_PAGE CUI_HID_FORMAT_PAGE
-#define HID_REDLINING_DLG CUI_HID_REDLINING_DLG
-#define HID_REDLINING_EDIT CUI_HID_REDLINING_EDIT
-#define HID_REDLINING_PREV CUI_HID_REDLINING_PREV
-#define HID_REDLINING_NEXT CUI_HID_REDLINING_NEXT
#define HID_FORMAT_PARAGRAPH_STD CUI_HID_FORMAT_PARAGRAPH_STD
#define HID_VALUESET_NUM CUI_HID_VALUESET_NUM
#define HID_MEASURE_CTL_PREVIEW CUI_HID_MEASURE_CTL_PREVIEW
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 21b49a9..74c763b 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -29,8 +29,6 @@
// class SvxPostItDialog -
/*
-{k:\svx\prototyp\dialog\memo.bmp}
-
[Description]
In this dialog a note can be created or edited. If the
application holds a list of notes, it can be iterated
@@ -46,7 +44,7 @@ class SvxPostItDialog : public
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/shared/01/02230300.xhp |6 ++ 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit 7c7158b88241fbd10350495567eb5b8420755780 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 26 12:29:49 2013 + update help ids for change tracking comment dialog .ui conversion Change-Id: I2636be03b38b2438108253736bceba597dd90660 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7f71022..d773688 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -7713,8 +7713,6 @@ svx_FloatingWindow_RID_SVXFLOAT_FONTWORK_ALIGNMENT,1790869504, svx_FloatingWindow_RID_SVXFLOAT_FONTWORK_CHARSPACING,1790885888, svx_ImageButton_MD_MENU_ORGANISER_BTN_MENU_DOWN,1079963519, svx_ImageButton_MD_MENU_ORGANISER_BTN_MENU_UP,1079963518, -svx_ImageButton_RID_SVXDLG_POSTIT_BTN_NEXT,1237724688, -svx_ImageButton_RID_SVXDLG_POSTIT_BTN_PREV,1237724687, svx_ImageButton_RID_SVXFLOAT_3D_BTN_AMBIENT_COLOR,3388501583, svx_ImageButton_RID_SVXFLOAT_3D_BTN_ASSIGN,3388501512, svx_ImageButton_RID_SVXFLOAT_3D_BTN_CHANGE_TO_3D,3388501514, @@ -8093,7 +8091,6 @@ svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701, svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860, svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION,1368869387, svx_MultiLineEdit_RID_SVXDLG_IMAPURL_EDT_DESCRIPTION,1244989956, -svx_MultiLineEdit_RID_SVXDLG_POSTIT_ED_EDIT,1237715469, svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530, svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719, svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925, @@ -8203,7 +8200,6 @@ svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_DEL_MULTIPATH,1240879631, svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_ADD_NAMESPACE,1368887820, svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_DELETE_NAMESPACE,1368887822, svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_EDIT_NAMESPACE,1368887821, -svx_PushButton_RID_SVXDLG_POSTIT_BTN_AUTHOR,1237717521, svx_PushButton_RID_SVXDLG_RUBY_PB_CLOSE,2315375112, svx_PushButton_RID_SVXDLG_RUBY_PB_STYLIST,2315375108, svx_PushButton_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS,1368773123, diff --git a/source/text/shared/01/02230300.xhp b/source/text/shared/01/02230300.xhp index b73d4d8..29ac137 100644 --- a/source/text/shared/01/02230300.xhp +++ b/source/text/shared/01/02230300.xhp @@ -31,13 +31,11 @@ /history /meta body -bookmark xml-lang=en-US branch=hid/.uno:CommentChangeTracking id=bm_id6454378 localize=false/!-- HID added by script -- bookmark xml-lang=en-US branch=hid/.uno:CommentChangeTracking id=bm_id3153391 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:CommentChange id=bm_id7807911 localize=false/!-- HID added by script -- bookmark xml-lang=en-US branch=hid/.uno:CommentChange id=bm_id3152459 localize=false/ -bookmark xml-lang=en-US branch=hid/CUI_HID_REDLINING_EDIT id=bm_id3153882 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/comment/CommentDialog id=bm_id3153882 localize=false/ paragraph role=heading id=hd_id3083278 xml-lang=en-US level=1 l10n=U oldref=1Comment/paragraph -paragraph role=paragraph id=par_id3148983 xml-lang=en-US l10n=U oldref=2variable id=kommentartextahelp hid=HID_REDLINING_EDITEnter a comment for the recorded change./ahelp +paragraph role=paragraph id=par_id3148983 xml-lang=en-US l10n=U oldref=2variable id=kommentartextahelp hid=cui/ui/comment/editEnter a comment for the recorded change./ahelp /variable/paragraph section id=howtoget embed href=text/shared/00/0402.xhp#kommentar/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
WIN Tinderboxes are limping
Hi, I'm urgently waiting for latest Master builds, but unfortunately Tinderboxes do not deliver. @6 shows a lot of red. @7 is green, but builds do not reach the server? [Bug 61482] New: MinGW: Index of /daily/master/Win-x86@7-MinGW shows several empty folders before current https://bugs.freedesktop.org/show_bug.cgi?id=61482 It would be great if someone could check and repair. Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - linguistic/source
linguistic/source/lngsvcmgr.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 31f2675c8f48c6e55c73e8e75bf9c7d3ac2874c7
Author: LeMoyne Castle lemoyne.cas...@gmail.com
Date: Tue Jan 1 12:47:35 2013 -0700
Paren fix for Ubu 10.04 build (and fdo#58417 ?)
The form: OuterCtor( InnerCtor(array[i]).method() )
with explicit ctor(s), unused optional arg on ctor+method
-- error 'parameter can not have variably modified type'
gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5.1).
Min fix: force precedence/associativity in type resolution.
fdo#58417 BTs inside 1 of these ctor calls.
Change-Id: I4d8b979df0fc827758b1e9a336031671425486ea
Reviewed-on: https://gerrit.libreoffice.org/1531
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 93697e6..fefef1c 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -744,7 +744,7 @@ void LngSvcMgr::UpdateAll()
const OUString *pNodeName = aNodeNames.getConstArray();
for (i = 0; i nNodeNames; ++i)
{
-Locale aLocale( LanguageTag( pNodeName[i]).getLocale() );
+Locale aLocale( (LanguageTag(pNodeName[i])).getLocale() );
Sequence OUString aCfgSvcs( getConfiguredServices( aService,
aLocale ));
Sequence OUString aAvailSvcs( getAvailableServices( aService,
aLocale ));
@@ -763,7 +763,7 @@ void LngSvcMgr::UpdateAll()
const Locale *pAvailLocale = aAvailLocales.getConstArray();
for (i = 0; i nAvailLocales; ++i)
{
-OUString aCfgLocaleStr( LanguageTag( pAvailLocale[i] ).getBcp47()
);
+OUString aCfgLocaleStr( (LanguageTag(pAvailLocale[i])).getBcp47()
);
Sequence OUString aAvailSvcs( getAvailableServices( aService,
pAvailLocale[i] ));
@@ -863,7 +863,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
if (0 == rName.compareTo( aSpellCheckerList,
aSpellCheckerList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailSpellSvcs);
+clearSvcInfoArray(pAvailSpellSvcs);
OUString aNode( aSpellCheckerList );
if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText ))
@@ -888,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
else if (0 == rName.compareTo( aGrammarCheckerList,
aGrammarCheckerList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailGrammarSvcs);
+clearSvcInfoArray(pAvailGrammarSvcs);
OUString aNode( aGrammarCheckerList );
if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText ))
@@ -916,7 +916,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
else if (0 == rName.compareTo( aHyphenatorList,
aHyphenatorList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailHyphSvcs);
+clearSvcInfoArray(pAvailHyphSvcs);
OUString aNode( aHyphenatorList );
if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText ))
@@ -941,7 +941,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
else if (0 == rName.compareTo( aThesaurusList,
aThesaurusList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailThesSvcs);
+clearSvcInfoArray(pAvailThesSvcs);
OUString aNode( aThesaurusList );
if (lcl_SeqHasString( aThesaurusListEntries, aKeyText ))
@@ -1840,7 +1840,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String
rServiceName )
aCfgAny = aSvcImplNames;
DBG_ASSERT( aCfgAny.hasValue(), missing value for 'Any' type );
-OUString aCfgLocaleStr( LanguageTag( pLocale[i] ).getBcp47() );
+OUString aCfgLocaleStr( (LanguageTag(pLocale[i])).getBcp47() );
pValue-Value = aCfgAny;
pValue-Name = aNodeName;
pValue-Name += OUString::valueOf( (sal_Unicode) '/' );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source sd/source
forms/source/richtext/richtextimplcontrol.cxx |2 +-
sd/source/ui/animations/CustomAnimationDialog.cxx |1 -
sd/source/ui/view/drviews1.cxx| 10 +-
sd/source/ui/view/drviews5.cxx|1 -
4 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 633fca5f3caedac6ea59be99809ffa899cd1bfff
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Feb 25 21:15:55 2013 +0100
remove two more duplicates
Moreover clarify a comment and remove some commented code.
Change-Id: Iba87b9ea6675a9bb50b8af0f094891e59bd93bd8
Reviewed-on: https://gerrit.libreoffice.org/2406
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/forms/source/richtext/richtextimplcontrol.cxx
b/forms/source/richtext/richtextimplcontrol.cxx
index c23ed5c..c4faf3b 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -625,7 +625,7 @@ namespace frm
// don't draw the text over the border
lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height()
);
-// leave a space of one pixel between the surroundings of the control
+// leave a space of two pixels between the surroundings of the
control
// and the content
lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1dc4e74..e6c03d6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1855,7 +1855,6 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
FreeResource();
mpRBClickSequence-SetClickHdl( LINK( this,
CustomAnimationDurationTabPage, implControlHdl ) );
-mpRBClickSequence-SetClickHdl( LINK( this,
CustomAnimationDurationTabPage, implControlHdl ) );
mpLBTrigger-SetSelectHdl( LINK( this, CustomAnimationDurationTabPage,
implControlHdl ) );
if( pSet-getPropertyState( nHandleStart ) != STLPropertyState_AMBIGUOUS )
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 2a2bfba..10c5c62 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -444,15 +444,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
if (meEditMode == EM_PAGE)
maTabControl.SetCurPageId (nActualPageNum + 1);
}
-/*AF: The LayerDialogChildWindow is not used anymore (I hope).
-if (GetViewFrame()-KnowsChildWindow(
-LayerDialogChildWindow::GetChildWindowId()))
-{
-GetViewFrame()-SetChildWindow(
-LayerDialogChildWindow::GetChildWindowId(),
-IsLayerModeActive());
-}
-*/
+
ResetActualLayer();
Invalidate( SID_PAGEMODE );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 152dc11..c87d25b 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -571,7 +571,6 @@ void DrawViewShell::ReadUserDataSequence ( const
::com::sun::star::uno::Sequence
}
ChangeEditMode (meEditMode, ! IsLayerModeActive());
-ChangeEditMode (meEditMode, ! IsLayerModeActive());
ResetActualLayer();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: WIN Tinderboxes are limping
Hello Rainer, About @6, Win-x86_6 might be ok once current building done thanks to Andras' commit (https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=b4e8f99a253ee20cba0718d042ca17cca2e8dcb5) About @7, I don't know. Julien -- View this message in context: http://nabble.documentfoundation.org/WIN-Tinderboxes-are-limping-tp4040189p4040191.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/xexptran.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 1580aa9249a483e51b550a539dd9bff0200f4426
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Feb 21 21:35:33 2013 -0600
coverity#736009 Explicit null dereferenced
Change-Id: If6ae3637f901ed8d424125c19e04f64c3a27c126
Reviewed-on: https://gerrit.libreoffice.org/2325
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 2158444..bb53c66 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1610,7 +1610,7 @@ void SdXMLImExSvgDElement::AddPolygon(
for(sal_Int32 a(0L); a nCnt; a++)
{
-if(!pFlags || drawing::PolygonFlags_CONTROL != *pFlagArray)
+if(!pFlags || drawing::PolygonFlags_CONTROL != *pFlagArray++)
{
bool bDidWriteAsCurve(false);
@@ -2093,7 +2093,6 @@ void SdXMLImExSvgDElement::AddPolygon(
// next point
pPointArray++;
-pFlagArray++;
}
// close path if closed poly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)
Hi Tom, Tom Tromey píše v Pá 22. 02. 2013 v 11:14 -0700: Michael Even better than this would (perhaps) be a break inside thrower that Michael is caught here type breakpoint - that we could invoke to land us in Michael whatever code is going to throw as it does that [ and before it started Michael all the magic cleanup / unwinding work ]. That is - assuming that it's Michael possible for the code to know (at that point) where it will ultimately Michael end up (? ;-) I think it isn't possible in general. When an exception is thrown, I think all that can really be determined is the next catch point. What this means is that if you have a series of throws and re-throws, winding up at some catch, then the best you could do is stop at the re-throw that leads to that catch. Even if this is not solving everything / the general case, I think this would still be pretty useful for LibreOffice - I don't remember being bitten by rethrows when debugging LO problems. And always one could set this thing [how to call it, actually? ;-)] where the re-throw happens, and try again - still it would save quite some time compared to first setting a breakpoint to get to the relevant piece of code + catch throw + catch catch + hope that they are the right ones. Here, suppose the comment marks the catch you are concerned with. You want to find the throw that leads to this point. The original throw in doit can only see as far as the catchpoint in dd2. That is because arbitrary code can be run there -- for example it may swallow the exception and no more throwing is even done. So this hypothetical breakpoint would only trigger at the re-throw in dd2. In other words - I'd love if gdb were able to do this even with the re-throw limitation :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ext/macromigration/migrationlog.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 810437181bbca4f273deac7a7bfb61fced4ef4e0
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 26 15:23:29 2013 +0200
WaE: ignoring return value
Change-Id: Ib445acdb01808cf5d05cd29973b568956d717e61
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx
b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 977547c1..229ee2f 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -433,7 +433,7 @@ namespace dbmm
if ( !m_pData-sBackupLocation.isEmpty() )
{
OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
-sBackedUp.replaceFirst( $location$, m_pData-sBackupLocation );
+sBackedUp = sBackedUp.replaceFirst( $location$,
m_pData-sBackupLocation );
aBuffer.appendAscii( === );
aBuffer.append ( OUString( MacroMigrationResId(
STR_DATABASE_DOCUMENT ) ) );
@@ -462,7 +462,7 @@ namespace dbmm
continue;
OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ?
STR_FORM : STR_REPORT ) );
-sDocTitle.replaceFirst( $name$, rDoc.sName );
+sDocTitle = sDocTitle.replaceFirst( $name$, rDoc.sName );
aBuffer.appendAscii( === );
aBuffer.append ( sDocTitle );
@@ -474,9 +474,9 @@ namespace dbmm
)
{
OUString sMovedLib( sMovedLibTemplate );
-sMovedLib.replaceFirst( $type$,
getScriptTypeDisplayName( lib-eType ) );
-sMovedLib.replaceFirst( $old$, lib-sOldName );
-sMovedLib.replaceFirst( $new$, lib-sNewName );
+sMovedLib = sMovedLib.replaceFirst( $type$,
getScriptTypeDisplayName( lib-eType ) );
+sMovedLib = sMovedLib.replaceFirst( $old$, lib-sOldName
);
+sMovedLib = sMovedLib.replaceFirst( $new$, lib-sNewName
);
aBuffer.append( sMovedLib );
aBuffer.append( sal_Unicode( '\n' ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/uiconfig
extensions/uiconfig/scanner.ui | 480 + 1 file changed, 480 insertions(+) New commits: commit 278b976d4e24e7d6d9b0ba888fb7bcc4126b8f81 Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Sat Feb 9 12:22:15 2013 +0300 Converted Insert - picture - scan - select source widget. Change-Id: Ic593056b43e145554b0d011e1547f3c4c098a508 Reviewed-on: https://gerrit.libreoffice.org/2061 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/extensions/uiconfig/scanner.ui b/extensions/uiconfig/scanner.ui new file mode 100644 index 000..8216a8d --- /dev/null +++ b/extensions/uiconfig/scanner.ui @@ -0,0 +1,480 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Scanner +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=button3 +property name=label translatable=yesAbout +Dev_ice/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child +child + object class=GtkButton id=button4 +property name=label translatable=yesCreate +Previe_w/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position3/property + /packing +/child +child + object class=GtkButton id=button5 +property name=label translatable=yes_Scan/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position4/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkFrame id=frame1 +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - linguistic/source
linguistic/source/lngsvcmgr.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 75bd73e78fcb986ad47ab5309658489ddd521707
Author: LeMoyne Castle lemoyne.cas...@gmail.com
Date: Tue Jan 1 12:47:35 2013 -0700
Paren fix for Ubu 10.04 build (and fdo#58417 ?)
The form: OuterCtor( InnerCtor(array[i]).method() )
with explicit ctor(s), unused optional arg on ctor+method
-- error 'parameter can not have variably modified type'
gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5.1).
Min fix: force precedence/associativity in type resolution.
fdo#58417 BTs inside 1 of these ctor calls.
Change-Id: I4d8b979df0fc827758b1e9a336031671425486ea
Reviewed-on: https://gerrit.libreoffice.org/1531
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Lubos Lunak llu...@suse.com
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 93697e6..fefef1c 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -744,7 +744,7 @@ void LngSvcMgr::UpdateAll()
const OUString *pNodeName = aNodeNames.getConstArray();
for (i = 0; i nNodeNames; ++i)
{
-Locale aLocale( LanguageTag( pNodeName[i]).getLocale() );
+Locale aLocale( (LanguageTag(pNodeName[i])).getLocale() );
Sequence OUString aCfgSvcs( getConfiguredServices( aService,
aLocale ));
Sequence OUString aAvailSvcs( getAvailableServices( aService,
aLocale ));
@@ -763,7 +763,7 @@ void LngSvcMgr::UpdateAll()
const Locale *pAvailLocale = aAvailLocales.getConstArray();
for (i = 0; i nAvailLocales; ++i)
{
-OUString aCfgLocaleStr( LanguageTag( pAvailLocale[i] ).getBcp47()
);
+OUString aCfgLocaleStr( (LanguageTag(pAvailLocale[i])).getBcp47()
);
Sequence OUString aAvailSvcs( getAvailableServices( aService,
pAvailLocale[i] ));
@@ -863,7 +863,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
if (0 == rName.compareTo( aSpellCheckerList,
aSpellCheckerList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailSpellSvcs);
+clearSvcInfoArray(pAvailSpellSvcs);
OUString aNode( aSpellCheckerList );
if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText ))
@@ -888,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
else if (0 == rName.compareTo( aGrammarCheckerList,
aGrammarCheckerList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailGrammarSvcs);
+clearSvcInfoArray(pAvailGrammarSvcs);
OUString aNode( aGrammarCheckerList );
if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText ))
@@ -916,7 +916,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
else if (0 == rName.compareTo( aHyphenatorList,
aHyphenatorList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailHyphSvcs);
+clearSvcInfoArray(pAvailHyphSvcs);
OUString aNode( aHyphenatorList );
if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText ))
@@ -941,7 +941,7 @@ void LngSvcMgr::Notify( const uno::Sequence OUString
rPropertyNames )
else if (0 == rName.compareTo( aThesaurusList,
aThesaurusList.getLength() ))
{
// delete old cached data, needs to be acquired new on demand
- clearSvcInfoArray(pAvailThesSvcs);
+clearSvcInfoArray(pAvailThesSvcs);
OUString aNode( aThesaurusList );
if (lcl_SeqHasString( aThesaurusListEntries, aKeyText ))
@@ -1840,7 +1840,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String
rServiceName )
aCfgAny = aSvcImplNames;
DBG_ASSERT( aCfgAny.hasValue(), missing value for 'Any' type );
-OUString aCfgLocaleStr( LanguageTag( pLocale[i] ).getBcp47() );
+OUString aCfgLocaleStr( (LanguageTag(pLocale[i])).getBcp47() );
pValue-Value = aCfgAny;
pValue-Name = aNodeName;
pValue-Name += OUString::valueOf( (sal_Unicode) '/' );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: WIN Tinderboxes are limping
On Tuesday 26 of February 2013, Rainer Bielefeld wrote: Hi, I'm urgently waiting for latest Master builds, but unfortunately Tinderboxes do not deliver. @6 shows a lot of red. @7 is green, but builds do not reach the server? [Bug 61482] New: MinGW: Index of /daily/master/Win-x86@7-MinGW shows several empty folders before current https://bugs.freedesktop.org/show_bug.cgi?id=61482 It would be great if someone could check and repair. The #6 tinderbox has been sending build failure mails since the instsetoo_native gbuild conversion. The #7 tinderbox apparently builds fine, but it looks like it doesn't create the .zip archives to upload, quite possibly for similar reasons. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 4-0, 4-0-1] Fix build of libreoffice-4-0 with g++ 4.4.3
Kristian Rietveld píše v So 23. 02. 2013 v 21:40 +0100: Hi all, I built the libreoffice-4-0 branch from git on Ubuntu 10.04 today, which has g++ 4.4.3 as compiler. The build fails in linguistic/source/lngsvcmgr.cxx and the attached patch is necessary to make the build continue. Apart from this issue, the build is completed just fine. I don't know why exactly the patch is necessary, perhaps it is a compiler bug. Yup, it looks like a compiler bug. I have found slightly more elegant workaround in master and pushed it for 4-0 and 4-0-1 branches, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=31f2675c8f48c6e55c73e8e75bf9c7d3ac2874c7 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0-1id=75bd73e78fcb986ad47ab5309658489ddd521707 Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ext/macromigration/migrationlog.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 24bd259451fae36c993977f52d62365fa63ac87c
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 26 15:42:15 2013 +0200
String::SearchAndReplaceAllAscii() corresponds to OUString::replaceAll()
The code originally used the former methods, so now when it has been
changed to use OUStrings instead, it should use the latter. (I don't
know if it is significant in the presumably quite specific use cases
here.)
Change-Id: I83cc7c602f376784054f479668171ccfa7f478f7
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx
b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 229ee2f..4a8c631 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -433,7 +433,7 @@ namespace dbmm
if ( !m_pData-sBackupLocation.isEmpty() )
{
OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
-sBackedUp = sBackedUp.replaceFirst( $location$,
m_pData-sBackupLocation );
+sBackedUp = sBackedUp.replaceAll( $location$,
m_pData-sBackupLocation );
aBuffer.appendAscii( === );
aBuffer.append ( OUString( MacroMigrationResId(
STR_DATABASE_DOCUMENT ) ) );
@@ -462,7 +462,7 @@ namespace dbmm
continue;
OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ?
STR_FORM : STR_REPORT ) );
-sDocTitle = sDocTitle.replaceFirst( $name$, rDoc.sName );
+sDocTitle = sDocTitle.replaceAll( $name$, rDoc.sName );
aBuffer.appendAscii( === );
aBuffer.append ( sDocTitle );
@@ -474,9 +474,9 @@ namespace dbmm
)
{
OUString sMovedLib( sMovedLibTemplate );
-sMovedLib = sMovedLib.replaceFirst( $type$,
getScriptTypeDisplayName( lib-eType ) );
-sMovedLib = sMovedLib.replaceFirst( $old$, lib-sOldName
);
-sMovedLib = sMovedLib.replaceFirst( $new$, lib-sNewName
);
+sMovedLib = sMovedLib.replaceAll( $type$,
getScriptTypeDisplayName( lib-eType ) );
+sMovedLib = sMovedLib.replaceAll( $old$, lib-sOldName );
+sMovedLib = sMovedLib.replaceAll( $new$, lib-sNewName );
aBuffer.append( sMovedLib );
aBuffer.append( sal_Unicode( '\n' ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 121 ++---
1 file changed, 60 insertions(+), 61 deletions(-)
New commits:
commit b1b8e14c4f0cd06d4a36614f04f2b1145a5ea006
Author: David Verrier dverr...@gmail.com
Date: Tue Feb 26 12:59:22 2013 +0100
Translated German comments and some messages into English
Change-Id: I2d92db30bacc52d487df2a0a118b430bc3425f69
Reviewed-on: https://gerrit.libreoffice.org/2427
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 279dfcc..912e30f 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -161,8 +161,8 @@ namespace
}
OQueryTableConnection aInfo(pTableView, aInfoData);
-// da ein OQueryTableConnection-Objekt nie den Besitz der
uebergebenen Daten uebernimmt, sondern sich nur den Zeiger merkt,
-// ist dieser Zeiger auf eine lokale Variable hier unkritisch,
denn aInfoData und aInfo haben die selbe Lebensdauer
+// Because OQueryTableConnection never takes ownership of the data
passed to it, but only remembers the pointer,
+// this pointer to a local variable is not critical, as aInfoData
and aInfo have the same lifetime
pTableView-NotifyTabConnection( aInfo );
}
else
@@ -180,10 +180,10 @@ namespace
pConn-UpdateLineList();
// Modified-Flag
// SetModified();
-// und neu zeichnen
+// and redraw
pConn-RecalcLines();
-// fuer das unten folgende Invalidate muss ich dieser neuen
Connection erst mal die Moeglichkeit geben,
-// ihr BoundingRect zu ermitteln
+// for the following Invalidate, the new Connection must first
be able
+// to determine its BoundingRect
pConn-InvalidateConnection();
}
}
@@ -739,11 +739,11 @@ namespace
OTableFields _rFieldList,
sal_Bool bMulti )
{
-// * darf keine Filter enthalten : habe ich die entsprechende Warnung
schon angezeigt ?
+// * must not contain a filter : have I already shown the correct
warning ?
sal_Bool bCritsOnAsterikWarning = sal_False;// ** TMFS **
OUString aFieldName,aCriteria,aWhereStr,aHavingStr,aWork/*,aOrderStr*/;
-// Zeilenweise werden die Ausdrucke mit AND verknuepft
+// print line by line joined with AND
sal_uInt16 nMaxCriteria = 0;
OTableFields::iterator aIter = _rFieldList.begin();
OTableFields::iterator aEnd = _rFieldList.end();
@@ -795,8 +795,8 @@ namespace
if ( pEntryField-isAggreateFunction() ||
pEntryField-IsGroupBy() )
{
-if (aHavingStr.isEmpty())// noch keine
Kriterien
-aHavingStr += OUString('('); //
Klammern
+if (aHavingStr.isEmpty())// no more
criteria
+aHavingStr += OUString('('); // bracket
else
aHavingStr += C_AND;
@@ -804,9 +804,9 @@ namespace
{
OSL_ENSURE(!pEntryField-GetFunction().isEmpty(),No function name for
aggregate given!);
aHavingStr += pEntryField-GetFunction();
-aHavingStr += OUString('('); //
Klammern
+aHavingStr += OUString('('); // bracket
aHavingStr += aWork;
-aHavingStr += OUString(')'); //
Klammern
+aHavingStr += OUString(')'); // bracket
}
else
aHavingStr += aWork;
@@ -837,8 +837,8 @@ namespace
}
else
{
-if ( aWhereStr.isEmpty() ) // noch keine
Kriterien
-aWhereStr += OUString('('); //
Klammern
+if ( aWhereStr.isEmpty() ) // no more
criteria
+aWhereStr += OUString('('); // bracket
else
aWhereStr += C_AND;
@@ -870,11 +870,11 @@ namespace
}
}
}
-// nur einmal f�r jedes Feld
+// only once for each field
else
[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/UnoDocumentSettings.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9fb829abd39cfe789e80dc6fec53292396d07d30
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 26 15:00:05 2013 +0100
warning C4805: != : unsafe mix of bool and sal_Bool
Change-Id: Ic1b8c2c179f80217fd7096203f2784d5873b6dc2
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 7c3ba84..e9d6f65 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -905,7 +905,7 @@ void DocumentSettings::_setPropertyValues( const
PropertyMapEntry** ppEntries, c
case HANDLE_EMBED_FONTS:
{
-sal_Bool bNewValue = sal_False;
+bool bNewValue = false;
if ( *pValues = bNewValue )
{
bChanged = ( pDoc-IsUsingEmbededFonts() != bNewValue );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] [PUSHED] convert odk to gbuild and add to tail_build
On 02/23/2013 10:39 PM, Peter Foley (via Code Review) wrote: Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2288 Approvals: Peter Foley: Verified; Looks good to me, approved It looks like there is some race leading to random results. For multiple make distclean ./autogen.sh make dev-install runs over the same sources, cd solver/unxlngx6/installation/opt/sdk find . | LC_ALL=C sort gives varying results. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source sc/uiconfig
sc/source/ui/dbgui/sortkeydlg.cxx |3 sc/uiconfig/scalc/ui/textimportcsv.ui | 153 +- 2 files changed, 98 insertions(+), 58 deletions(-) New commits: commit 0ac6c626287ee6789296172ddbe5d4e5dc5600ac Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 26 12:56:34 2013 + make seperator editboxes stick to their labelling widgets Change-Id: I434d10fb4a02c70deb3a4b88b00a9313c0f53b9d diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index 5a2f1c8..afe12d5 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -347,8 +347,8 @@ /packing /child child - object class=GtkCheckButton id=other -property name=label translatable=yes_Other/property + object class=GtkCheckButton id=semicolon +property name=label translatable=yesS_emicolon/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -358,102 +358,135 @@ property name=draw_indicatorTrue/property /object packing -property name=left_attach4/property +property name=left_attach2/property property name=top_attach0/property property name=width1/property property name=height1/property /packing /child child - object class=GtkEntry id=inputother + object class=GtkCheckButton id=space +property name=label translatable=yesS_pace/property property name=visibleTrue/property property name=can_focusTrue/property +property name=receives_defaultFalse/property property name=hexpandTrue/property -property name=max_length10/property -property name=invisible_charâ/property -property name=width_chars3/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property /object packing -property name=left_attach5/property +property name=left_attach3/property property name=top_attach0/property property name=width1/property property name=height1/property /packing /child child - object class=GtkLabel id=texttextdelimiter + object class=GtkGrid id=grid3 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property -property name=xalign0/property -property name=label translatable=yesTe_xt delimiter/property -property name=use_underlineTrue/property +property name=column_spacing12/property +child + object class=GtkCheckButton id=other +property name=label translatable=yes_Other/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property +
[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/unomodel.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 270ad08ff5732eba30a611ff6775eaf58259b5ae Author: Thomas Arnhold tho...@arnhold.org Date: Tue Feb 26 15:08:35 2013 +0100 clarify the duplicate Change-Id: I5d4a64a7d7effc49f982ad33fa6a535d99863f96 Reviewed-on: https://gerrit.libreoffice.org/2404 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 56fe815..fbd341a 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2736,6 +2736,7 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference drawing::XDrawP rDoc.AddUndo(rDoc.GetSdrUndoFactory().CreateUndoDeletePage(*pPage)); } +// remove both pages rDoc.RemoveMasterPage( nPage ); rDoc.RemoveMasterPage( nPage ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 59eb06e91af29e2260d23492f0f32a7fb4e8cc73
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 26 14:16:07 2013 +
initialize relative col/row/tab indicees to avoid false positives.
Change-Id: I165b9745b36499e625e6f5d65a622fcfbb535d63
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8e8c329..b1dbdcd 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -448,6 +448,7 @@ static ScSingleRefData lcl_ScToken_InitSingleRef()
{
ScSingleRefData aRef;
aRef.InitAddress( ScAddress() );
+aRef.nRelCol = aRef.nRelRow = aRef.nRelTab = 0;
return aRef;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fba47cdec494b716131dc6cdff3a750e980ba610
Author: Michael Meeks michael.me...@suse.com
Date: Tue Feb 26 14:18:00 2013 +
and avoid type issues when zeroing.
Change-Id: Ib230b6e0c5c6ca7884023b849ae6a0ae9c3005a6
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b1dbdcd..da787e1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -448,7 +448,9 @@ static ScSingleRefData lcl_ScToken_InitSingleRef()
{
ScSingleRefData aRef;
aRef.InitAddress( ScAddress() );
-aRef.nRelCol = aRef.nRelRow = aRef.nRelTab = 0;
+aRef.nRelCol = 0;
+aRef.nRelRow = 0;
+aRef.nRelTab = 0;
return aRef;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sc/source
sc/source/filter/inc/worksheethelper.hxx |2 ++
sc/source/filter/oox/workbookfragment.cxx | 13 +
sc/source/filter/oox/worksheethelper.cxx | 14 --
3 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit ab82ad7b1c5c9e0567319e60aacd6e960668ad2d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 21 02:23:13 2013 +0100
delay importing all drawing elements until content is loaded, fdo#60488
Otherwise charts with data ranges on other sheets will not be painted
correctly as the data is missing when the chart is rendered for the
first time. This was not a problem before the cached value import
because the hard recalc would have forced a repaint anyway.
The new way should also be a bit quicker.
Change-Id: I6a010a4dffad6ebe2264b8312f93b16d9c87
Reviewed-on: https://gerrit.libreoffice.org/2412
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-on: https://gerrit.libreoffice.org/2418
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index 32db180..2efa6e4 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -303,6 +303,8 @@ public:
voidinitializeWorksheetImport();
/** Final conversion after importing the worksheet. */
voidfinalizeWorksheetImport();
+/** Final import of drawing objects. Has to be called after all content
has been imported */
+void finalizeDrawingImport();
voidsetCellFormula( const
::com::sun::star::table::CellAddress rTokenAddress, const rtl::OUString );
voidsetCellFormula( const
::com::sun::star::table::CellAddress rTokenAddress, sal_Int32 );
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index ba0c2fd..41a6ce7 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -231,6 +231,7 @@ void WorkbookFragment::finalizeImport()
typedef ::std::pair WorksheetGlobalsRef, FragmentHandlerRef
SheetFragmentHandler;
typedef ::std::vector SheetFragmentHandler SheetFragmentVector;
SheetFragmentVector aSheetFragments;
+std::vectorWorksheetHelper* maHelpers;
WorksheetBuffer rWorksheets = getWorksheets();
sal_Int32 nWorksheetCount = rWorksheets.getWorksheetCount();
for( sal_Int32 nWorksheet = 0; nWorksheet nWorksheetCount; ++nWorksheet )
@@ -286,7 +287,10 @@ void WorkbookFragment::finalizeImport()
// insert the fragment into the map
if( xFragment.is() )
+{
aSheetFragments.push_back( SheetFragmentHandler(
xSheetGlob, xFragment.get() ) );
+maHelpers.push_back(xFragment.get());
+}
}
}
}
@@ -301,6 +305,15 @@ void WorkbookFragment::finalizeImport()
{
// import the sheet fragment
importOoxFragment( aIt-second );
+}
+
+for( std::vectorWorksheetHelper*::iterator aIt = maHelpers.begin(), aEnd
= maHelpers.end(); aIt != aEnd; ++aIt )
+{
+(*aIt)-finalizeDrawingImport();
+}
+
+for( SheetFragmentVector::iterator aIt = aSheetFragments.begin(), aEnd =
aSheetFragments.end(); aIt != aEnd; ++aIt )
+{
// delete fragment object and WorkbookGlobals object, will free all
allocated sheet buffers
aIt-second.clear();
aIt-first.reset();
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index fbb4dd2..4d29ad3 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -339,6 +339,8 @@ public:
/** Final conversion after importing the worksheet. */
voidfinalizeWorksheetImport();
+void finalizeDrawingImport();
+
private:
typedef ::std::vector sal_Int32 OutlineLevelVec;
typedef ::std::pair ColumnModel, sal_Int32ColumnModelRange;
@@ -953,9 +955,12 @@ void WorksheetGlobals::finalizeWorksheetImport()
lclUpdateProgressBar( mxFinalProgress, 0.5 );
convertColumns();
convertRows();
-lclUpdateProgressBar( mxFinalProgress, 0.75 );
-finalizeDrawings();
lclUpdateProgressBar( mxFinalProgress, 1.0 );
+}
+
+void WorksheetGlobals::finalizeDrawingImport()
+{
+finalizeDrawings();
// forget current sheet index in global data
setCurrentSheetIndex( -1 );
@@ -1575,6 +1580,11 @@ void WorksheetHelper::finalizeWorksheetImport()
mrSheetGlob.finalizeWorksheetImport();
}
+void
[Libreoffice-commits] core.git: 4 commits - helpcompiler/inc helpcompiler/source solenv/gbuild
helpcompiler/inc/HelpLinker.hxx |2 helpcompiler/source/HelpCompiler.cxx |9 helpcompiler/source/HelpLinker.cxx |6 solenv/gbuild/AllLangHelp.mk | 166 solenv/gbuild/HelpTarget.mk | 706 +++ solenv/gbuild/TargetLocations.mk | 26 + solenv/gbuild/Zip.mk |9 solenv/gbuild/gbuild.mk |2 8 files changed, 920 insertions(+), 6 deletions(-) New commits: commit 0909384b98deeaa9e788b30be46e6c81b9adc68b Author: David Tardon dtar...@redhat.com Date: Tue Feb 26 15:00:59 2013 +0100 add support for building help packs into gbuild Change-Id: I1cc5600ab0f6236c451d07bfb5ad9ee42ea4754a diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk new file mode 100644 index 000..143f6bc --- /dev/null +++ b/solenv/gbuild/AllLangHelp.mk @@ -0,0 +1,166 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +gb_AllLangHelp_HELPDIRNAME := helpcontent2 +gb_AllLangHelp_AUXDIRNAME := auxiliary +gb_AllLangHelp_HELPDIR := $(gb_AllLangHelp_HELPDIRNAME)/source +gb_AllLangHelp_AUXDIR := $(gb_AllLangHelp_HELPDIR)/$(gb_AllLangHelp_AUXDIRNAME) +gb_AllLangHelp_TRANLATIONSDIR := $(SRCDIR)/translations + +# class AllLangHelp + +# Creates and delivers all language versions of a module. + +gb_AllLangHelp_LANGS := $(gb_WITH_LANG) + +define gb_AllLangHelp__translation_exists +$(or \ + $(filter en-US,$(1)),\ + $(and \ + $(wildcard $(SRCDIR)/$(gb_AllLangHelp_AUXDIR)/$(1)),\ + $(wildcard $(gb_AllLangHelp_TRANLATIONSDIR)/source/$(1)/$(gb_AllLangHelp_HELPDIRNAME)) \ + ) \ +) +endef + +gb_AllLangHelp__get_helpname = $(1)/$(2) +gb_AllLangHelp__get_zipname = $(1)_$(2) + +$(dir $(call gb_AllLangHelp_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_AllLangHelp_get_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(call gb_AllLangHelp_get_target,%) : + $(call gb_Output_announce,$*,$(true),ALH,5) + touch $@ + +$(call gb_AllLangHelp_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),ALH,5) + $(call gb_Helper_abbreviate_dirs,\ + rm -f $(call gb_AllLangHelp_get_target,$*) $(HELP_DELIVERABLES) \ + ) + +# gb_AllLangHelp_AllLangHelp__one_lang module lang helpname zipname +define gb_AllLangHelp_AllLangHelp__one_lang +$(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) +$(call gb_HelpTarget_set_configdir,$(3),$(gb_AllLangHelp_AUXDIR)) +$(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) + +$(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_zipfile,$(3)) +$(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_outdir_target,$(4)) +$(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_target,$(3)) +$(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_HelpTarget_get_clean_target,$(3)) +$(call gb_AllLangHelp_get_clean_target,$(1)) : HELP_DELIVERABLES += $(call gb_HelpTarget_get_outdir_target,$(4)) + +$(call gb_Deliver_add_deliverable,$(call gb_HelpTarget_get_outdir_target,$(4)),$(call gb_HelpTarget_get_zipfile,$(3)),$(1)) + +endef + +# Create and deliver help packs for a module for all languages. +# +# gb_AllLangHelp_AllLangHelp module +define gb_AllLangHelp_AllLangHelp +$(call gb_AllLangHelp_get_clean_target,$(1)) : HELP_DELIVERABLES := + +$(foreach lang,$(gb_AllLangHelp_LANGS),\ + $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\ + $(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call gb_AllLangHelp__get_helpname,$(1),$(lang)),$(call gb_AllLangHelp__get_zipname,$(1),$(lang) + +$(call gb_AllLangHelp_get_target,$(1)) :| $(dir $(call gb_AllLangHelp_get_target,$(1))).dir + +$$(eval $$(call gb_Module_register_target,$(call gb_AllLangHelp_get_target,$(1)),$(call gb_AllLangHelp_get_clean_target,$(1 +$(call gb_Helper_make_userfriendly_targets,$(1),AllLangHelp) + +endef + +# gb_AllLangHelp_set_treefile module treefile +define gb_AllLangHelp_set_treefile +$(foreach lang,$(gb_AllLangHelp_LANGS),$(call gb_HelpTarget_set_treefile,$(call gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(gb_AllLangHelp_HELPDIR)/text)) + +endef + +# Add a help file. +# +# gb_AllLangHelp_add_helpfile module file +define gb_AllLangHelp_add_helpfile +$(foreach lang,$(gb_AllLangHelp_LANGS),$(call gb_HelpTarget_add_helpfile,$(call gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2))) + +endef + +# Add one or more help files. +# +# gb_AllLangHelp_add_helpfiles module file(s) +define gb_AllLangHelp_add_helpfiles +$(foreach lang,$(gb_AllLangHelp_LANGS),$(call
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82ac5169b3b18c4cd26d1fc061607163313ed094 Author: David Tardon dtar...@redhat.com Date: Sat Feb 23 12:03:53 2013 +0100 Updated core Project: help 81f8e6cfb8eae13a73536edcb08a09d73cf2b864 diff --git a/helpcontent2 b/helpcontent2 index 7c7158b..81f8e6c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7c7158b88241fbd10350495567eb5b8420755780 +Subproject commit 81f8e6cfb8eae13a73536edcb08a09d73cf2b864 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryModule_ooo.mk
RepositoryModule_ooo.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 4dc532009b86e516e80ba101be2c57aa9a3abc67 Author: David Tardon dtar...@redhat.com Date: Tue Feb 26 15:31:51 2013 +0100 gbuildify helpcontent2 Change-Id: I1ba0cfcda123e7db95a16945c9accd113e925967 diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index a2fefe7..23b5e11 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,HELP,helpcontent2) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ $(call gb_Helper_optional,HUNSPELL,hunspell) \ hwpfilter \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 627f220bc1aaa3d5bacdf0e886a1af5cc3f3bff8 Author: David Tardon dtar...@redhat.com Date: Tue Feb 26 15:40:29 2013 +0100 Updated core Project: help 86d61cd53feccd830412794561d29390bcfba095 diff --git a/helpcontent2 b/helpcontent2 index 81f8e6c..86d61cd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 81f8e6cfb8eae13a73536edcb08a09d73cf2b864 +Subproject commit 86d61cd53feccd830412794561d29390bcfba095 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: prj/dmake
0 files changed New commits: commit 86d61cd53feccd830412794561d29390bcfba095 Author: David Tardon dtar...@redhat.com Date: Tue Feb 26 15:40:29 2013 +0100 drop prj/dmake too Change-Id: I1b36088d5319e83e652a4c341a4fec6fbc0fee38 diff --git a/prj/dmake b/prj/dmake deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 25 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 +
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 0805b222f87bf99ec0c53ca678d1c670eb5293a2
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 26 15:36:09 2013 +0100
fdo#61507 import RTF_UPR and RTF_UD
It turns out Word wraps document title with these destinations if they
contain something that isn't possible to describe using legacy charsets.
Change-Id: Ic9417d0f23d44149acb3ae3dc9d4c281058a1b36
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 14c7486..9266505 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1517,7 +1517,11 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
m_aStates.top().nDestinationState =
DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE;
break;
case RTF_TITLE:
-m_aStates.top().nDestinationState = DESTINATION_TITLE;
+// \title inside \upr but outside \ud should be ignored.
+if (m_aStates.top().nDestinationState != DESTINATION_UPR)
+m_aStates.top().nDestinationState = DESTINATION_TITLE;
+else
+m_aStates.top().nDestinationState = DESTINATION_SKIP;
break;
case RTF_SUBJECT:
m_aStates.top().nDestinationState = DESTINATION_SUBJECT;
@@ -1615,6 +1619,13 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
OPEN_M_TOKEN(SPREPR, sPrePr);
OPEN_M_TOKEN(BOX, box);
OPEN_M_TOKEN(EQARR, eqArr);
+case RTF_UPR:
+m_aStates.top().nDestinationState = DESTINATION_UPR;
+break;
+case RTF_UD:
+// Anything inside \ud is just normal Unicode content.
+m_aStates.top().nDestinationState = DESTINATION_NORMAL;
+break;
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle
destination ' lcl_RtfToString(nKeyword) ');
// Make sure we skip destinations (even without \*) till we don't
handle them
@@ -3808,10 +3819,6 @@ int RTFDocumentImpl::popState()
if (m_xDocumentProperties.is())
m_xDocumentProperties-setGenerator(m_aStates.top().aDestinationText.makeStringAndClear());
break;
-case DESTINATION_TITLE:
-if (m_xDocumentProperties.is())
-
m_xDocumentProperties-setTitle(m_aStates.top().aDestinationText.makeStringAndClear());
-break;
case DESTINATION_SUBJECT:
if (m_xDocumentProperties.is())
m_xDocumentProperties-setSubject(m_aStates.top().aDestinationText.makeStringAndClear());
@@ -4234,6 +4241,14 @@ int RTFDocumentImpl::popState()
aState.nDestinationState == DESTINATION_SHPPICT ||
aState.nDestinationState == DESTINATION_SHAPE)
m_aStates.top().aFrame = aState.aFrame;
+else if (aState.nDestinationState == DESTINATION_TITLE)
+{
+if (m_aStates.top().nDestinationState == DESTINATION_TITLE)
+// The parent is a title as well, just append what we have so far.
+
m_aStates.top().aDestinationText.append(aState.aDestinationText.makeStringAndClear());
+else if (m_xDocumentProperties.is())
+
m_xDocumentProperties-setTitle(aState.aDestinationText.makeStringAndClear());
+}
if (m_pCurrentBuffer == m_aSuperBuffer)
{
if (!m_bHasFootnote)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 82490eb..a26d3ff 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -178,6 +178,7 @@ namespace writerfilter {
DESTINATION_MGROW,
DESTINATION_MBOX,
DESTINATION_MEQARR,
+DESTINATION_UPR,
};
enum RTFBorderState
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
0 files changed New commits: commit 2f00b691c0158ddd05afbc2336fa181dab2ae8b1 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 26 14:42:11 2013 + this dmake file in rsc was inadvertently added Change-Id: Ie8a8a8a4a82e3ca0175ac5a0275da6ca1474fa5d diff --git a/rsc/source/prj/dmake b/rsc/source/prj/dmake deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] move postprocess to gbuild
Hello LibreOffice gerrit bot,
I'd like you to reexamine a change. Please visit
https://gerrit.libreoffice.org/2426
to look at the new patch set (#2).
Change subject: move postprocess to gbuild
..
move postprocess to gbuild
the gb_Postprocess* foo could also be in gb_Module* as it is
conceptionally close ('do things globally/productwide'). OTOH I see no
obvious reason for e.g. signing not to be done right along with building
a lib/executable anyway instead of in postprocess. The same is likely
true for the other stuff too.
Change-Id: I9c8f569564c056643af7ca39bfe038ed228dcd3d
---
M Module_tail_build.mk
M postprocess/CustomTarget_config.mk
M postprocess/CustomTarget_images.mk
M postprocess/CustomTarget_registry.mk
M postprocess/CustomTarget_signing.mk
M postprocess/Module_postprocess.mk
D rsc/source/prj/dmake
M solenv/gbuild/AllLangResTarget.mk
M solenv/gbuild/Executable.mk
M solenv/gbuild/Library.mk
M solenv/gbuild/Package.mk
M solenv/gbuild/TargetLocations.mk
12 files changed, 31 insertions(+), 8 deletions(-)
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2426/2
--
To view, visit https://gerrit.libreoffice.org/2426
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I9c8f569564c056643af7ca39bfe038ed228dcd3d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56b44d0123e53e0a6e8309da32852d41694ad9ce Author: David Tardon dtar...@redhat.com Date: Tue Feb 26 15:45:50 2013 +0100 helpcontent is not dmake module anymore Change-Id: I6114f35f50282ccf7e9c3f69d28e7a53b5eb78f7 diff --git a/Makefile.in b/Makefile.in index 7895009..35a24d8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,7 +67,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILD echo gbuild_modules:= tail_build \\ $@ for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done $@ echo $@ - echo -n dmake_modules:= helpcontent2 $@ + echo -n dmake_modules:= $@ echo $@ -include $(WORKDIR)/modules.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - javaunohelper/Module_javaunohelper.mk javaunohelper/Zip_juh.mk jurt/Module_jurt.mk jurt/Zip_jurt.mk mysqlc/Library_mysqlc.mk odk/CustomTarget_javadoc.mk rid
javaunohelper/Module_javaunohelper.mk |1 javaunohelper/Zip_juh.mk | 56 - jurt/Module_jurt.mk |1 jurt/Zip_jurt.mk | 87 -- mysqlc/Library_mysqlc.mk |2 odk/CustomTarget_javadoc.mk | 24 + ridljar/Module_ridljar.mk |2 ridljar/Zip_ridl.mk | 59 --- ridljar/Zip_unoloader.mk | 35 - solenv/gbuild/JavaClassSet.mk |9 ++- solenv/gbuild/Zip.mk |2 11 files changed, 15 insertions(+), 263 deletions(-) New commits: commit c81e40d02610b665a9edcc73b57ac7e783913988 Author: Michael Stahl mst...@redhat.com Date: Tue Feb 26 15:19:47 2013 +0100 gbuild: Zip/Jar targets: depend on makefile to rebuild on removal Change-Id: I0b79b6c9018e4513b9f0b16be3e57f620d12ea23 diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index fab3ae4..2a81a87 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -68,9 +68,14 @@ $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_JavaClassSet_get_preparation_target,%) : mkdir -p $(dir $@) touch $@ +# depend on makefile to enforce a rebuild if files are removed from the classset define gb_JavaClassSet_JavaClassSet -$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_preparation_target,$(1)) -$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(call gb_JavaClassSet_get_target,$(1)) : \ + $(lastword $(MAKEFILE_LIST)) \ + $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := \ + $(lastword $(MAKEFILE_LIST)) \ + $(call gb_JavaClassSet_get_preparation_target,$(1)) endef diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index 89ca8a6..2685ce3 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -89,8 +89,10 @@ $(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1)) \ endef +# depend on makefile to enforce a rebuild if files are removed from the zip define gb_Zip_Zip $(call gb_Zip_Zip_internal,$(1),$(2)) +$(call gb_Zip_get_target,$(1)) : $(lastword $(MAKEFILE_LIST)) $(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1 $(call gb_Helper_make_userfriendly_targets,$(1),Zip) commit 34faec549ef33f77c4f866a4094d9fcf447025ee Author: Michael Stahl mst...@redhat.com Date: Tue Feb 26 15:11:45 2013 +0100 mysqlc: disable fast strings to remove dependency on LIBO_UDK_4.1 Change-Id: I0891f1e45f02b2d031903d85ad3ebe3df561529d diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index ffa194f..d97328a 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -11,6 +11,8 @@ $(eval $(call gb_Library_Library,mysqlc)) $(eval $(call gb_Library_set_warnings_not_errors,mysqlc)) +$(eval $(call gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING)) + $(eval $(call gb_Library_use_externals,mysqlc,\ boost_headers \ mysql \ commit dfdfd9e260c1b38f09f4a12d04d23a8fd2d2c7a3 Author: Michael Stahl mst...@redhat.com Date: Tue Feb 26 14:40:27 2013 +0100 odk: remove pointless variable Change-Id: I07406ca6e00f245de09a1be45b5fa4a694cb diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index 133e9a2..deddbb9 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -11,8 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/java/ref)) odkcommon_ZIPLIST += docs/java/ref -JAVADOCREFNAME := UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference - odk_JAVAPACKAGES := com.sun.star.comp.helper \ com.sun.star.lib.uno.helper \ com.sun.star.lib.unoloader \ @@ -25,7 +23,8 @@ $(odk_WORKDIR)/docs/java/ref/index.html: $(call gb_Jar_get_target,ridl) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) $(JAVADOC) -J-Xmx120m -use -splitindex \ -windowtitle Java UNO Runtime Reference \ - -header $(JAVADOCREFNAME) -d $(dir $@) \ + -header UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference\ + -d $(dir $@) \ -sourcepath $(SRCDIR)/ridljar/source/unoloader:$(SRCDIR)/ridljar:$(SRCDIR)/jurt:$(SRCDIR)/javaunohelper \ -classpath $(OUTDIR)/bin/ridl.jar \ -linkoffline ../../common/reg ./uno \ commit 43dd869ec9777bd9e8f79b12b8037aab28cd0716 Author: Michael Stahl mst...@redhat.com Date: Tue Feb 26 13:29:11 2013 +0100 odk: remove temporary Zip file gratuitous complexity 4 zip files containing ridl, unoloader, jurt and juh source files are created and copied to solver and unzipped again in odk when odk could simply
