[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.0.10'
Tag 'libcdr-0.0.10' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-01-25 08:04 -0800 Tagging 0.0.10 release Changes since libcdr-0.0.9-23: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source sal/inc
connectivity/source/parse/sqlbison.y | 13 -
sal/inc/sal/log-areas.dox|1 +
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit e7827d556c302965af352b186a5cec86b548cf2a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Jan 23 15:20:24 2013 +0100
OSQLParser::RuleIDToRule should not silently change s_aReverseRuleIDLookup
Change-Id: I2b408a23162b1200bbcd530be7acb42435388b04
Reviewed-on: https://gerrit.libreoffice.org/1826
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 96d0782..a0f7d43 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4772,7 +4772,18 @@ sal_uInt32 OSQLParser::StrToRuleID(const ::rtl::OString
rValue)
//-
OSQLParseNode::Rule OSQLParser::RuleIDToRule( sal_uInt32 _nRule )
{
-return s_aReverseRuleIDLookup[ _nRule ];
+OSQLParser::RuleIDMap::const_iterator i
(s_aReverseRuleIDLookup.find(_nRule));
+if (i == s_aReverseRuleIDLookup.end())
+{
+SAL_WARN(connectivity.parse,
+connectivity::OSQLParser::RuleIDToRule cannot reverse-lookup
rule.
+Reverse mapping incomplete?
+_nRule=' _nRule '
+yytname[_nRule]=' yytname[_nRule] ');
+return OSQLParseNode::UNKNOWN_RULE;
+}
+else
+return i-second;
}
//-
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index c167267..b5fa6f9 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -37,6 +37,7 @@ certain functionality.
@section connectivity
@li @c connectivity.mork
+@li @c connectivity.parse
@section cui
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gerrit reboot at about 1800 CET
Hello, it's that time of the year again, and gerrit needs a reboot due to system upgrades. ;-) Planned downtime is today at about 1800 CET, for about five minutes. As I'm on the road, hosting an event, I cannot determine an exact time, but try to be around 1800 CET (which is 1700 UTC). Sorry for the inconveniences, Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx|3
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 82 ++
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |2
3 files changed, 51 insertions(+), 36 deletions(-)
New commits:
commit cfe27d4a86fdcaedcfc422382e3da09abc429603
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Jan 23 15:36:35 2013 +0100
fix handling of subqueries in query design
- don't remove parentheses around subqueries
(without the parentheses, it is not valid SQL)
* when saving a Field (name value) typed by the user interactively
* when parsing SQL and constructing the initial Query Design view
- automatically add the necessary parentheses
when a SELECT statement is entered as column name
Also:
In code saving a Field (name value) typed by the user interactively,
factorise some common code
Assorted minor fixes (typos in comments, etc)
Change-Id: I3843258323c903cba23238b0730ec4eb5875f792
Reviewed-on: https://gerrit.libreoffice.org/1827
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 3c386db..8264152 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2198,7 +2198,8 @@ namespace
pColumnRef = pColumnRef-getChild(0);
OTableFieldDescRef aInfo = new OTableFieldDesc();
-if (pColumnRef-count() == 3
+if (pColumnRef-getKnownRuleID() !=
OSQLParseNode::subquery
+pColumnRef-count() == 3
SQL_ISPUNCTUATION(pColumnRef-getChild(0),()
SQL_ISPUNCTUATION(pColumnRef-getChild(2),))
)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 5544549..e85cb29 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -649,7 +649,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const
::rtl::OUString _sColumnName,
return bError;
}
//
-
-sal_Bool OSelectionBrowseBox::saveField(const String
_sFieldName,OTableFieldDescRef _pEntry,sal_Bool _bListAction)
+sal_Bool OSelectionBrowseBox::saveField(String _sFieldName
,OTableFieldDescRef _pEntry, sal_Bool _bListAction)
{
sal_Bool bError = sal_False;
@@ -680,50 +680,63 @@ sal_Bool OSelectionBrowseBox::saveField(const String
_sFieldName,OTableFieldDes
// we have to look which entries we should quote
const ::rtl::OUString sFieldAlias = _pEntry-GetFieldAlias();
-size_t nPass = 4;
::connectivity::OSQLParser rParser( rController.getParser() );
+{
+// automatically add parentheses around subqueries
+OSQLParseNode *pParseNode = NULL;
+OUString devnull;
+pParseNode = rParser.parseTree( devnull, _sFieldName, true );
+if (pParseNode == NULL)
+pParseNode = rParser.parseTree( devnull, _sFieldName, false );
+if (pParseNode != NULL SQL_ISRULE(pParseNode, select_statement))
+_sFieldName = ::rtl::OUString(() + _sFieldName + );
+}
+
OSQLParseNode* pParseNode = NULL;
-// 4 passes in trying to interprete the field name
-// - don't quote the field name, parse internationally
-// - don't quote the field name, parse en-US
-// - quote the field name, parse internationally
-// - quote the field name, parse en-US
-do
-{
-bool bQuote = ( nPass = 2 );
-bool bInternational = ( nPass % 2 ) == 0;
-
-::rtl::OUString sSql;
-if ( bQuote )
-sSql += ::dbtools::quoteName(
xMetaData-getIdentifierQuoteString(), _sFieldName );
-else
-sSql += _sFieldName;
+{
+// 4 passes in trying to interprete the field name
+// - don't quote the field name, parse internationally
+// - don't quote the field name, parse en-US
+// - quote the field name, parse internationally
+// - quote the field name, parse en-US
+size_t nPass = 4;
+::rtl::OUString sQuotedFullFieldName(::dbtools::quoteName(
xMetaData-getIdentifierQuoteString(), _sFieldName ));
+::rtl::OUString sFullFieldName(_sFieldName);
if ( _pEntry-isAggreateFunction() )
{
OSL_ENSURE(!_pEntry-GetFunction().isEmpty(),Functionname darf
hier nicht leer sein! ;-();
-::rtl::OUStringBuffer aTmpStr2( _pEntry-GetFunction());
-aTmpStr2.appendAscii(();
-aTmpStr2.append(sSql);
-aTmpStr2.appendAscii());
-sSql =
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 279a4f3fee500c9c09b252820d431e94cd700e75
Author: László Németh nem...@numbertext.org
Date: Thu Jan 24 10:20:59 2013 +0100
minor librelogo fix: remove ro lang. guess. (fix en_US detection)
Change-Id: I6fbd5cef4f5935f7932bd9b64774315baee0e50d
Reviewed-on: https://gerrit.libreoffice.org/1838
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index 556837d..13d7a2a 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -25,7 +25,7 @@ else:
__lngpath__ =
unohelper.fileUrlToSystemPath(re.sub(program/(fundamental.ini|fundamentalrc)$,
, urebootstrap))
__lngpath__ = __lngpath__ + share/Scripts/python/LibreLogo/.replace(/,
os.sep)
-__translang__ =
am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ro|ru|se|sl # FIXME
supported languages for language guessing, expand this list, according to the
localizations
+__translang__ =
am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ru|se|sl # FIXME
supported languages for language guessing, expand this list, according to the
localizations
__lng__ = {}
__docs__ = {}
__prevcode__ = None
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.0.0 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of our upcoming LibreOffice 4.0. The 4.0 will be our fifth major release in just over two years, and comes with a nice set of new features. Please be aware that LibreOffice 4.0 RC2 is not ready for production use, you should continue to use LibreOffice 3.6.4 for that. For further milestones towards 4.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan/4.0#4.0.0_release The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test - or checkout our manual test database for starting right away - http://manual-test.libreoffice.org/runtests/ For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.0.0 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.0.0/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: download.lst libcdr/ExternalProject_libcdr.mk libcdr/libcdr-configure.patch.1 libcdr/libcdr-issupported-exception.patch.1 libcdr/libcdr-msvc.patch libcdr/UnpackedTarball_cdr.m
RepositoryExternal.mk | 12 download.lst|4 libcdr/ExternalProject_libcdr.mk| 10 libcdr/UnpackedTarball_cdr.mk |8 libcdr/libcdr-configure.patch.1 | 432 libcdr/libcdr-issupported-exception.patch.1 | 43 -- libcdr/libcdr-msvc.patch| 284 -- writerperfect/Library_wpftdraw.mk |3 8 files changed, 25 insertions(+), 771 deletions(-) New commits: commit 851ca9c0c21baff00b2ee5a0f93e783c1605bae6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 25 10:29:59 2013 +0100 Uploading libcdr 0.0.10, hoping it works Change-Id: Ibf21b856c0f9da276df60680513421be3c871a2d diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 06a3c23..73dbbd8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -909,6 +909,7 @@ endif # SYSTEM_GRAPHITE ifeq ($(SYSTEM_ICU),YES) gb_LinkTarget__use_icu_headers:= +gb_ExternalProject__use_icu_headers:= define gb_LinkTarget__use_icudata $(call gb_LinkTarget_add_libs,$(1),-licudata) @@ -950,6 +951,17 @@ $(call gb_LinkTarget_set_include,$(1),\ endef +define gb_ExternalProject__use_icu_headers +$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,icu) +$(call gb_ExternalProject_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + $$(INCLUDE) \ +) + +endef + # icudata and icui18n is called icudt and icuin when built with MSVC :-/ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ diff --git a/download.lst b/download.lst index 0cf4fd1..407365a 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a -export CDR_TARBALL := libcdr-0.0.9.tar.bz2 +CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b +export CDR_TARBALL := libcdr-0.0.10.tar.bz2 MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2 VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 58465d5..f297026 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,libcdr,\ +icu_headers \ lcms2 \ wpd \ wpg \ @@ -30,6 +31,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj Release|Win32 \ touch $@ else ifeq ($(VCVER),100) @@ -39,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ msbuild.exe libcdr.vcxproj /p:Configuration=Release \ touch $@ else @@ -48,6 +51,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ touch $@ endif @@ -56,8 +60,10 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ -PKG_CONFIG= \ - ./configure \ +export PKG_CONFIG= \ +export ICU_LIBS= \ +export ICU_CFLAGS=-I$(OUTDIR)/inc/external \ +./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index b8b6726..be1e7d7 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-configure.patch.1 \ - libcdr/libcdr-issupported-exception.patch.1 \ - libcdr/libcdr-msvc.patch \
[Libreoffice-commits] .: libcdr/ExternalProject_libcdr.mk RepositoryExternal.mk
RepositoryExternal.mk| 12 +++- libcdr/ExternalProject_libcdr.mk |2 +- 2 files changed, 4 insertions(+), 10 deletions(-) New commits: commit 8e9675d2330b3eff788843c75f657c284a07fe54 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 25 10:55:04 2013 +0100 Trying to fix libcdr build Change-Id: Ifcadb0e7be11d32e370b578e21f5d8881bab640f diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 73dbbd8..34e1d9d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -909,7 +909,7 @@ endif # SYSTEM_GRAPHITE ifeq ($(SYSTEM_ICU),YES) gb_LinkTarget__use_icu_headers:= -gb_ExternalProject__use_icu_headers:= +gb_ExternalProject__use_icu:= define gb_LinkTarget__use_icudata $(call gb_LinkTarget_add_libs,$(1),-licudata) @@ -951,14 +951,8 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -define gb_ExternalProject__use_icu_headers -$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,icu) -$(call gb_ExternalProject_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - $$(INCLUDE) \ -) +define gb_ExternalProject__use_icu +$(call gb_ExternalProject_use_package,$(1),icu) endef diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index f297026..7bc7377 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\ )) $(eval $(call gb_ExternalProject_use_externals,libcdr,\ -icu_headers \ + icu \ lcms2 \ wpd \ wpg \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 harald-koes...@htp-tel.de changed: What|Removed |Added Depends on||57061 --- Comment #89 from harald-koes...@htp-tel.de --- Added bug 57061. User profile is not imported to version 4.0.0. Users expect this AND nearly all users are effected. Hence I expect a lot of user complaints and a bad press, if this bug is not corrected. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice Development [ Comments in .pptx ] (Annotations Issue)
Vinaya Mandke wrote: Now I can collect (parse) and save all the comment info on a particular slide. As of now I am saving it in std::strings. Any chance to upload a work-in-progress version of that to gerrit? Code talks better than emails. ;) How are annotations actually displayed on the slide ? Which paint function is called ? For importing the stuff, have a look at xmloff/source/draw/ximppage.cxx's DrawAnnotationContext class. To your question: sd/source/ui/annotations/annotationtag.cxx, AnnotationHdl::CreateB2dIAObject() - but I guess that can be left as-is for the while? HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - comphelper/inc comphelper/source editeng/inc editeng/source offapi/com sw/inc sw/source vcl/source
comphelper/inc/comphelper/TypeGeneration.hxx |2
comphelper/source/property/TypeGeneration.cxx|4 +
editeng/inc/editeng/brshitem.hxx |6 +
editeng/inc/editeng/memberids.hrc|2
editeng/source/items/frmitems.cxx| 72 ++-
offapi/com/sun/star/text/BaseFrameProperties.idl | 16 +
sw/inc/unoprnms.hxx |4 -
sw/source/core/layout/paintfrm.cxx |6 +
sw/source/core/unocore/unoframe.cxx | 10 ++-
sw/source/core/unocore/unomap.cxx|4 +
sw/source/core/unocore/unoprnms.cxx |2
vcl/source/gdi/gradient.cxx | 18 ++---
12 files changed, 131 insertions(+), 15 deletions(-)
New commits:
commit 2448539161d105c2b629ba090c732647d2e99c6d
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 25 10:35:52 2013 +0100
Gradient::operator==: amazing how nobody noticed this for 13 years
Two Gradient instances equal if all of their members equal, not any.
Change-Id: I313c1b145005f295f47b27e7af7ec96d5ee6168f
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index ea8a6bc..72d5ffc 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -339,15 +339,15 @@ sal_Bool Gradient::operator==( const Gradient rGradient
) const
if ( mpImplGradient == rGradient.mpImplGradient )
return sal_True;
-if ( (mpImplGradient-meStyle ==
rGradient.mpImplGradient-meStyle) ||
- (mpImplGradient-mnAngle ==
rGradient.mpImplGradient-mnAngle) ||
- (mpImplGradient-mnBorder ==
rGradient.mpImplGradient-mnBorder) ||
- (mpImplGradient-mnOfsX==
rGradient.mpImplGradient-mnOfsX)||
- (mpImplGradient-mnOfsY==
rGradient.mpImplGradient-mnOfsY)||
- (mpImplGradient-mnStepCount ==
rGradient.mpImplGradient-mnStepCount) ||
- (mpImplGradient-mnIntensityStart ==
rGradient.mpImplGradient-mnIntensityStart) ||
- (mpImplGradient-mnIntensityEnd==
rGradient.mpImplGradient-mnIntensityEnd)||
- (mpImplGradient-maStartColor ==
rGradient.mpImplGradient-maStartColor) ||
+if ( (mpImplGradient-meStyle ==
rGradient.mpImplGradient-meStyle)
+ (mpImplGradient-mnAngle ==
rGradient.mpImplGradient-mnAngle)
+ (mpImplGradient-mnBorder ==
rGradient.mpImplGradient-mnBorder)
+ (mpImplGradient-mnOfsX==
rGradient.mpImplGradient-mnOfsX)
+ (mpImplGradient-mnOfsY==
rGradient.mpImplGradient-mnOfsY)
+ (mpImplGradient-mnStepCount ==
rGradient.mpImplGradient-mnStepCount)
+ (mpImplGradient-mnIntensityStart ==
rGradient.mpImplGradient-mnIntensityStart)
+ (mpImplGradient-mnIntensityEnd==
rGradient.mpImplGradient-mnIntensityEnd)
+ (mpImplGradient-maStartColor ==
rGradient.mpImplGradient-maStartColor)
(mpImplGradient-maEndColor==
rGradient.mpImplGradient-maEndColor) )
return sal_True;
else
commit 0544946effdd464e8bfcb8cc64969a6e76a36096
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jan 24 17:54:37 2013 +0100
SwFrm::PaintBackground: paint gradient in layout if SvxBrushItem wants it
Change-Id: I72eec18ac6265fd2e0df06eb68115d1d0034be15
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 19d6889..40cf352 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2076,7 +2076,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// draw poly-polygon transparent
pOutDev-DrawTransparent( aDrawPoly, nTransparencyPercent );
}
-else
+else if (!pBrush || pBrush-GetFillStyle() !=
drawing::FillStyle_GRADIENT)
{
SwRegionRects aRegion( rOut, 4 );
if ( !bGrfIsTransparent )
@@ -2089,6 +2089,8 @@ void DrawGraphic( const SvxBrushItem *pBrush,
pOutDev-DrawRect( aRegion[i].SVRect() );
}
}
+else
+pOutDev-DrawGradient(rOut.SVRect(), pBrush-GetGradient());
pOutDev -Pop();
}
@@ -7065,7 +7067,7 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem*
rpBrush,
if ( !rBack.GetColor().GetTransparency() ||
rBack.GetGraphicPos() != GPOS_NONE ||
rpCol ||
- (bConsiderBackgroundTransparency (rBack.GetColor() !=
COL_TRANSPARENT))
+ (bConsiderBackgroundTransparency (rBack.GetColor() !=
COL_TRANSPARENT || rBack.GetFillStyle() == drawing::FillStyle_GRADIENT))
)
{
rpBrush = rBack;
commit 2a34dd723baac31e9ce0c639ce9244c0ced4ff06
Author: Miklos Vajna
[Libreoffice-commits] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk | 12 1 file changed, 12 insertions(+) New commits: commit fbe72cdfbe71a142b5444c82765d489d84b82afa Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 25 11:19:46 2013 +0100 Deliver icu headers Change-Id: Ic62f18c8aa29b0f0b158f3d3a9988703def899d3 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 0e91f32..5aa2b06 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -9,6 +9,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/layout,\ + source/layout/*.h \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ + source/common/unicode/*.h \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ + source/i18n/unicode/*.h \ +)) + $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) ifeq ($(OS),WNT) ifeq ($(COM),GCC) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0-0]: Add link to additional sdk-examples
On Wed, 2013-01-23 at 08:08 +, Stephan Bergmann wrote: I have submitted a patch for review: https://gerrit.libreoffice.org/1819 Found pushed without a mail here :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/filter/excel/xecontent.cxx | 18 ++---
sc/source/filter/excel/xeextlst.cxx |3 +
sc/source/filter/excel/xeformula.cxx |9
sc/source/filter/excel/xeroot.cxx| 51 +++
sc/source/filter/excel/xestream.cxx | 24 ++--
sc/source/filter/excel/xetable.cxx |3 +
sc/source/filter/inc/formulabase.hxx |6 ++-
sc/source/filter/inc/xeroot.hxx |5 ++
sc/source/filter/inc/xestream.hxx|4 +-
sc/source/filter/oox/formulabase.cxx | 36 ++-
sc/source/filter/xcl97/XclExpChangeTrack.cxx |3 +
11 files changed, 136 insertions(+), 26 deletions(-)
New commits:
commit fd96008b90c024c6e4c3a251440a7878629bbc17
Author: Eike Rathke er...@redhat.com
Date: Thu Jan 24 23:17:00 2013 +0100
resolved fdo#59819 write correct OOXML function name mapping
OOXML export so far used the internal English PODF symbols that worked
only by accident. As soon as function names or operators differed it was
plain wrong. Use the existing OOXML mapping instead that also the import
uses.
For example, in OOXML the IFNA function is stored as _xlfn.IFNA, Excel
2013 could not read the IFNA that we wrote.
Also, do not write a definedName element in OOXML for new functions
that in the binary format are written as macro calls and need a defined
name entry.
(cherry picked from commit 1162738c6fbd8505ffa27b28118318cc522a5368)
non-dbgutil build [-Werror=unused-parameter]
(cherry picked from commit 0adb958c451660ec0eea012480b6327dd2aefeb4)
Change-Id: I094990f1e5179045bfba559fea10bc0a3fe17731
Reviewed-on: https://gerrit.libreoffice.org/1854
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index a58f1b0..5a46ad5 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -931,12 +931,14 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream rStrm )
if(!IsTextRule(eOperation) !IsTopBottomRule(eOperation))
{
rWorksheet-startElement( XML_formula, FSEND );
-rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 0 ) ));
+rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+mrFormatEntry.CreateTokenArry( 0 ),
GetRoot().GetOpCodeMap() ));
rWorksheet-endElement( XML_formula );
if (bFmla2)
{
rWorksheet-startElement( XML_formula, FSEND );
-rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 1 ) ));
+rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+mrFormatEntry.CreateTokenArry( 1 ),
GetRoot().GetOpCodeMap() ));
rWorksheet-endElement( XML_formula );
}
}
@@ -1076,7 +1078,8 @@ void XclExpCfvo::SaveXml( XclExpXmlStream rStrm )
rtl::OString aValue;
if(mrEntry.GetType() == COLORSCALE_FORMULA)
{
-rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(),
maSrcPos, mrEntry.GetFormula()-Clone() );
+rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(),
maSrcPos,
+mrEntry.GetFormula()-Clone(), GetRoot().GetOpCodeMap() );
aValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 );
}
else
@@ -1582,14 +1585,16 @@ XclExpDV::XclExpDV( const XclExpRoot rRoot, sal_uLong
nScHandle ) :
Formula compiler supports this by offering two
different functions
CreateDataValFormula() and CreateListValFormula(). */
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_LISTVAL,
*xScTokArr );
-msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(), xScTokArr.get() );
+msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(),
+xScTokArr.get(), GetRoot().GetOpCodeMap() );
}
}
else
{
// no list validation - convert the formula
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_DATAVAL,
*xScTokArr );
-msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(), xScTokArr.get() );
+msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(),
+xScTokArr.get(), GetRoot().GetOpCodeMap() );
}
}
@@ -1598,7 +1603,8 @@ XclExpDV::XclExpDV( const XclExpRoot rRoot, sal_uLong
nScHandle ) :
if( xScTokArr.get() )
{
[Libreoffice-commits] .: 7 commits - cui/source helpcontent2 svx/uiconfig sw/uiconfig unusedcode.easy
cui/source/tabpages/backgrnd.cxx| 23 -- helpcontent2|2 svx/uiconfig/ui/asianphoneticguidedialog.ui | 12 ++- sw/uiconfig/swriter/ui/autotext.ui |4 + sw/uiconfig/swriter/ui/editcategories.ui|4 + sw/uiconfig/swriter/ui/exchangedatabases.ui |2 sw/uiconfig/swriter/ui/tabletextflowpage.ui | 103 ++-- unusedcode.easy |5 + 8 files changed, 81 insertions(+), 74 deletions(-) New commits: commit 300c0fe3671837e863b5265de407d0d60e90f964 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 10:17:19 2013 + set mnemonic widgets in autotext dialog Change-Id: I1f9204c40024bcc7b5de407f134c2aa8f64414c4 diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui index 1535a07..0925aac 100644 --- a/sw/uiconfig/swriter/ui/autotext.ui +++ b/sw/uiconfig/swriter/ui/autotext.ui @@ -248,6 +248,8 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=label translatable=yesName/property +property name=use_underlineTrue/property +property name=mnemonic_widgetname/property /object packing property name=left_attach0/property @@ -261,6 +263,8 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=label translatable=yesShortcut/property +property name=use_underlineTrue/property +property name=mnemonic_widgetshortname/property /object packing property name=left_attach2/property commit d862063fc95b7f8a6b49402cb91811bcd2d4eb84 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 10:03:42 2013 + set mnemonic widgets in edit categories dialog Change-Id: I8b284dac86e47851db9f380d274ce5a2b2863046 diff --git a/sw/uiconfig/swriter/ui/editcategories.ui b/sw/uiconfig/swriter/ui/editcategories.ui index 122c43c..4ae12a6 100644 --- a/sw/uiconfig/swriter/ui/editcategories.ui +++ b/sw/uiconfig/swriter/ui/editcategories.ui @@ -125,6 +125,7 @@ property name=xalign0/property property name=label translatable=yesSelection list/property property name=use_underlineTrue/property +property name=mnemonic_widgetgroup/property /object packing property name=left_attach0/property @@ -169,6 +170,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesPath/property +property name=use_underlineTrue/property +property name=mnemonic_widgetpathlb/property /object packing property name=left_attach1/property @@ -184,6 +187,7 @@ property name=xalign0/property property name=label translatable=yesCategory/property property name=use_underlineTrue/property +property name=mnemonic_widgetname/property /object packing property name=left_attach0/property commit 9de187e918ae856b3383851be1fac7745e1333d2 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 10:02:26 2013 + set mnemonic widgets in exchange databases dialog Change-Id: I034763480bae904feec2329c50d6ee06d0ee863a diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui index eb76a9f..d3af20b 100644 --- a/sw/uiconfig/swriter/ui/exchangedatabases.ui +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -104,6 +104,7 @@ property name=xalign0/property property name=label translatable=yesDatabases in Use/property property name=use_underlineTrue/property +property name=mnemonic_widgetinuselb/property /object packing property name=left_attach0/property @@ -119,6 +120,7 @@ property name=xalign0/property property name=label translatable=yes_Available Databases/property property name=use_underlineTrue/property +property name=mnemonic_widgetavailablelb/property /object packing property name=left_attach1/property commit
[Libreoffice-commits] .: 5 commits - source/text
source/text/shared/01/0506.xhp | 38 +++ source/text/swriter/01/0212.xhp | 88 ++-- source/text/swriter/01/04180400.xhp | 16 +++--- source/text/swriter/01/05090300.xhp | 65 +- 4 files changed, 104 insertions(+), 103 deletions(-) New commits: commit 7cd661f12ff18a7a95573e034d92e025198843a1 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 10:26:17 2013 + update help ids for autotext dialog .ui conversion diff --git a/source/text/swriter/01/0212.xhp b/source/text/swriter/01/0212.xhp index f8e8dd9..c0c19c6 100644 --- a/source/text/swriter/01/0212.xhp +++ b/source/text/swriter/01/0212.xhp @@ -28,7 +28,7 @@ /meta body section id=autotext -bookmark xml-lang=en-US branch=hid/.uno:EditGlossary id=bm_id3098317 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/autotext/AutoTextDialog id=bm_id3098317 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:EditGlossary id=bm_id3154100 localize=false/ paragraph role=heading id=hd_id3147512 xml-lang=en-US level=1 l10n=U oldref=1link href=text/swriter/01/0212.xhp name=AutoTextAutoText/link/paragraph paragraph role=paragraph id=par_id3154571 xml-lang=en-US l10n=U oldref=2variable id=autotexttextahelp hid=.uno:EditGlossaryCreates, edits, or inserts AutoText. You can store formatted text, text with graphics, tables, and fields as AutoText. To quickly insert AutoText, type the shortcut for the AutoText in your document, and then press F3./ahelp @@ -41,17 +41,17 @@ embed href=text/swriter/guide/autotext.xhp#autotext/ paragraph role=heading id=hd_id3148982 xml-lang=en-US level=2 l10n=U oldref=4AutoText/paragraph paragraph role=paragraph id=par_id3153640 xml-lang=en-US l10n=U oldref=5The emphAutoText /emphdialog lists the AutoText categories and entries./paragraph -bookmark xml-lang=en-US branch=hid/sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP id=bm_id3152778 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/autotext/insert id=bm_id3152778 localize=false/ paragraph role=heading id=hd_id3152766 xml-lang=en-US level=3 l10n=U oldref=6Display remainder of name as a suggestion while typing/paragraph -paragraph role=paragraph id=par_id3145758 xml-lang=en-US l10n=CHG oldref=51ahelp hid=SW:CHECKBOX:DLG_GLOSSARY:CB_INSERT_TIPDisplays a suggestion for completing a word as a Help Tip after you type the first three letters of a word that matches an AutoText entry. To accept the suggestion, press Enter. If more than one AutoText entry matches the letters that you type, press Ctrl+Tab to advance through the entries./ahelp For example, to insert dummy text, type Dum, and then press Enter./paragraph +paragraph role=paragraph id=par_id3145758 xml-lang=en-US l10n=CHG oldref=51ahelp hid=modules/swriter/ui/autotext/insertDisplays a suggestion for completing a word as a Help Tip after you type the first three letters of a word that matches an AutoText entry. To accept the suggestion, press Enter. If more than one AutoText entry matches the letters that you type, press Ctrl+Tab to advance through the entries./ahelp For example, to insert dummy text, type Dum, and then press Enter./paragraph paragraph role=paragraph id=par_id3149177 xml-lang=en-US l10n=U oldref=53To display the list in reverse order, press switchinline select=syscaseinline select=MACCommand /caseinlinedefaultinlineCtrl/defaultinline/switchinline+Shift+Tab./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:DLG_GLOSSARY:ED_NAME id=bm_id3155856 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/autotext/name id=bm_id3155856 localize=false/ paragraph role=heading id=hd_id3151378 xml-lang=en-US level=3 l10n=U oldref=9Name/paragraph -paragraph role=paragraph id=par_id3155862 xml-lang=en-US l10n=U oldref=10ahelp hid=SW:EDIT:DLG_GLOSSARY:ED_NAMELists the name of the currently selected AutoText entry. If you have selected text in the document, type the name of the new AutoText entry, click the emphAutoText /emphbutton, and then choose emphNew/emph./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:DLG_GLOSSARY:ED_SHORTNAME id=bm_id3150124 localize=false/ +paragraph role=paragraph id=par_id3155862 xml-lang=en-US l10n=U oldref=10ahelp hid=modules/swriter/ui/autotext/nameLists the name of the currently selected AutoText entry. If you have selected text in the document, type the name of the new AutoText entry, click the emphAutoText /emphbutton, and then choose emphNew/emph./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/autotext/shortname id=bm_id3150124 localize=false/ paragraph role=heading id=hd_id3150113 xml-lang=en-US level=3 l10n=U oldref=12Shortcut/paragraph -paragraph role=paragraph id=par_id3147413 xml-lang=en-US l10n=U oldref=13ahelp hid=SW:EDIT:DLG_GLOSSARY:ED_SHORTNAMEDisplays the shortcut for the selected AutoText entry. If you are creating a new
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - chart2/source
chart2/source/model/filter/XMLFilter.cxx | 40 ++-
1 file changed, 19 insertions(+), 21 deletions(-)
New commits:
commit dceedfdc720c70e8a02542a534d2243a1f66da28
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jan 24 22:24:44 2013 -0500
bnc#798271: Don't delete the PropertyMapEntry instance prematurely.
When using comphelper::PropertyMapEntry array to create a UNO property
set, we need to make sure we keep this instance while the property set
object is alive, else it would cause a very hard-to-debug problem down
the road...
In this particular case, the aExportInfoMap array instance was destroyed
when it went out of scope, but the xInfoSet which references it was used
afterward.
Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
Reviewed-on: https://gerrit.libreoffice.org/1858
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 10a565a..75692c4 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -631,28 +631,26 @@ sal_Int32 XMLFilter::impl_Export(
xServiceFactory-createInstanceWithArguments(
C2U(com.sun.star.comp.Svx.GraphicExportHelper),
aGraphicResolverArgs ), uno::UNO_QUERY );
-uno::Reference beans::XPropertySet xInfoSet;
+// property map for export info set
+comphelper::PropertyMapEntry aExportInfoMap[] =
{
-// property map for export info set
-comphelper::PropertyMapEntry aExportInfoMap[] =
-{
-{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0
), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(ExportTableNumberList), 0,
::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ NULL, 0, 0, NULL, 0, 0 }
-};
-
-xInfoSet = comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
-
-SvtSaveOptions aSaveOpt;
-OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
-sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
-if( ! bOasis )
-xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
-}
+{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(ExportTableNumberList), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ NULL, 0, 0, NULL, 0, 0 }
+};
+
+uno::Reference beans::XPropertySet xInfoSet =
+comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
+
+SvtSaveOptions aSaveOpt;
+OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
+sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
+if( ! bOasis )
+xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
sal_Int32 nArgs = 2;
if( xGraphicObjectResolver.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit fc8512b5dfa5b3977f1571f50b2700f790191f92
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jan 24 16:50:32 2013 +0100
Template Manager: remote repositories only for experimental mode
Change-Id: I79501bdcd25f362065d9b95efd1a43f6be84577e
Reviewed-on: https://gerrit.libreoffice.org/1847
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f1e69f5..833e556 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -30,6 +30,7 @@
#include sfx2/thumbnailviewitem.hxx
#include sot/storage.hxx
#include svtools/imagemgr.hxx
+#include svtools/miscopt.hxx
#include svtools/PlaceEditDialog.hxx
#include tools/urlobj.hxx
#include unotools/moduleoptions.hxx
@@ -177,6 +178,13 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
+SvtMiscOptions aMiscOptions;
+if ( !aMiscOptions.IsExperimentalMode() )
+{
+sal_uInt16 nPos = mpViewBar-GetItemId(TBI_TEMPLATE_REPOSITORY);
+mpViewBar-RemoveItem(nPos);
+}
+
mpViewBar-Show();
mpActionBar-Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] including Ubuntu fonts in Windows/OSX installers
Hi guys, On Thu, 2013-01-24 at 19:56 -0600, Norbert Thiebaud wrote: Note: I will abide by whatever decision is reached The ESC discussed this precise issue in the past; and made a decision not to include the Ubuntu font, and because of that, this is the status quo today. No doubt someone clever could dig out the minutes on that. If we want to re-discuss it - since the issue is a legal / advertising / bikeshed-cum-flame-bait issue. I'd recommend we re-discuss it in an ESC call preferably after 4.0 / FOSDEM. The more concise, accurate and detailed a write-up we have for all the fonts we currently ship the better the decision we can take. Anyone griping about this should build better data: Name, License, coverage, binary-size, hinting etc. One potential solution might be to remove other non-free fonts (if indeed we are bundling them) - OTOH - there is AFAICS no need for a hasty conclusion on this: we can tweak this for 4.0.1 and/or 3.6.next as/when necessary. but let's not pretend that this is not, for all practical purpose, an advertising clause. 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] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f4bcb81063ff0d00f4d2843a046c2b1cf04228d6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 25 11:54:48 2013 +0100 Trying to use wildcard to deliver the headers Change-Id: I684ad3e2050dd07958c4bf2267c20274958c5673 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 5aa2b06..fb11295 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -10,15 +10,15 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/layout,\ - source/layout/*.h \ + $(wildcard source/layout/*.h) \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ - source/common/unicode/*.h \ + $(wildcard source/common/unicode/*.h) \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ - source/i18n/unicode/*.h \ + $(wildcard source/i18n/unicode/*.h) \ )) $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - icu/ExternalPackage_icu.mk RepositoryExternal.mk
RepositoryExternal.mk |6 - icu/ExternalPackage_icu.mk | 174 +++-- 2 files changed, 170 insertions(+), 10 deletions(-) New commits: commit 0ffe214cd51705f3e7ab464bb9f10ab173efa45a Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 25 13:14:55 2013 +0200 ICU headers are now copied to solver Change-Id: Ib06a88278d6bf8912ae13de2c44e1cedeb046428 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 34e1d9d..dbdf4a9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -941,11 +941,9 @@ gb_ICU_suffix:= endif define gb_LinkTarget__use_icu_headers -$(call gb_LinkTarget_use_unpacked,$(1),icu) +$(call gb_LinkTarget_use_package,$(1),icu) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(OUTDIR)/inc/external \ $$(INCLUDE) \ ) commit c92da8b228166c961dd320ebcff3d17abac5edf9 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 25 13:02:49 2013 +0200 Deliver the ICU headers for real Change-Id: Id740d54a36d9b094b728b840f362c7a8e182cfec diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index fb11295..fbb9ee0 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -9,16 +9,178 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/layout,\ - $(wildcard source/layout/*.h) \ +$(eval $(call gb_ExternalPackage_add_unpacked_files,icu,inc/external/layout,\ + source/layout/LayoutEngine.h \ + source/layout/LEFontInstance.h \ + source/layout/LEGlyphFilter.h \ + source/layout/LEGlyphStorage.h \ + source/layout/LEInsertionList.h \ + source/layout/LELanguages.h \ + source/layout/LEScripts.h \ + source/layout/LESwaps.h \ + source/layout/LETypes.h \ + source/layout/loengine.h \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ - $(wildcard source/common/unicode/*.h) \ +$(eval $(call gb_ExternalPackage_add_unpacked_files,icu,inc/external/unicode,\ + source/common/unicode/appendable.h \ + source/common/unicode/brkiter.h \ + source/common/unicode/bytestream.h \ + source/common/unicode/bytestrie.h \ + source/common/unicode/bytestriebuilder.h \ + source/common/unicode/caniter.h \ + source/common/unicode/chariter.h \ + source/common/unicode/dbbi.h \ + source/common/unicode/docmain.h \ + source/common/unicode/dtintrv.h \ + source/common/unicode/errorcode.h \ + source/common/unicode/icudataver.h \ + source/common/unicode/icuplug.h \ + source/common/unicode/idna.h \ + source/common/unicode/localpointer.h \ + source/common/unicode/locid.h \ + source/common/unicode/messagepattern.h \ + source/common/unicode/normalizer2.h \ + source/common/unicode/normlzr.h \ + source/common/unicode/parseerr.h \ + source/common/unicode/parsepos.h \ + source/common/unicode/platform.h \ + source/common/unicode/ptypes.h \ + source/common/unicode/putil.h \ + source/common/unicode/rbbi.h \ + source/common/unicode/rep.h \ + source/common/unicode/resbund.h \ + source/common/unicode/schriter.h \ + source/common/unicode/std_string.h \ + source/common/unicode/strenum.h \ + source/common/unicode/stringpiece.h \ + source/common/unicode/stringtriebuilder.h \ + source/common/unicode/symtable.h \ + source/common/unicode/ubidi.h \ + source/common/unicode/ubrk.h \ + source/common/unicode/ucasemap.h \ + source/common/unicode/ucat.h \ + source/common/unicode/uchar.h \ + source/common/unicode/ucharstrie.h \ + source/common/unicode/ucharstriebuilder.h \ + source/common/unicode/uchriter.h \ + source/common/unicode/uclean.h \ + source/common/unicode/ucnv.h \ + source/common/unicode/ucnv_cb.h \ + source/common/unicode/ucnv_err.h \ + source/common/unicode/ucnvsel.h \ + source/common/unicode/uconfig.h \ + source/common/unicode/udata.h \ + source/common/unicode/uenum.h \ + source/common/unicode/uidna.h \ + source/common/unicode/uiter.h \ + source/common/unicode/uloc.h \ + source/common/unicode/umachine.h \ + source/common/unicode/umisc.h \ + source/common/unicode/unifilt.h \ + source/common/unicode/unifunct.h \ + source/common/unicode/unimatch.h \ + source/common/unicode/uniset.h \ + source/common/unicode/unistr.h \ + source/common/unicode/unorm.h \ + source/common/unicode/unorm2.h \ + source/common/unicode/uobject.h \ + source/common/unicode/urename.h \ +
[Libreoffice-commits] .: 4 commits - sc/qa sc/source
dev/null |binary
sc/qa/unit/data/contentCSV/cachedValue.csv |2
sc/qa/unit/data/contentCSV/matrix2.csv | 12 +--
sc/qa/unit/data/ods/cachedValue.ods|binary
sc/qa/unit/data/ods/matrix.ods |binary
sc/qa/unit/helper/csv_handler.hxx |4 -
sc/qa/unit/subsequent_filters-test.cxx | 95 ++---
sc/source/core/data/cell.cxx |4 -
sc/source/core/tool/formularesult.cxx |7 ++
sc/source/filter/xml/xmlcelli.cxx | 36 ++
sc/source/filter/xml/xmlcelli.hxx |6 +
sc/source/ui/docshell/docsh.cxx|4 -
12 files changed, 108 insertions(+), 62 deletions(-)
New commits:
commit 71a8f79f4bdf567b6fce23091ca1663455cadba9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Jan 25 13:15:09 2013 +0100
improve the tests for cached value import
The test now also tests for Err:* import and checks that these have been
imported as error values and not only as text values.
Future clean-up:
Merge the cached matrix test file into the cached value one.
Change-Id: I9c0a06f058ff6620bd7ca169b3bee07a5430997e
diff --git a/sc/qa/unit/data/contentCSV/matrix2.csv
b/sc/qa/unit/data/contentCSV/matrix2.csv
index 2effd61..8450f0d 100644
--- a/sc/qa/unit/data/contentCSV/matrix2.csv
+++ b/sc/qa/unit/data/contentCSV/matrix2.csv
@@ -1,6 +1,6 @@
-Matrices with errors and other misc potential problems:
-Err:502,Err:502,Err:502,,error result
-#N/A,#N/A,#N/A,,n/a
-TRUE,TRUE,TRUE,,Display TRUE instead of 1
-FALSE,FALSE,FALSE,,Display FALSE instead of 0
-42,,42,,Display blank cell instead of 0
+Matrices with errors and other misc potential problems:
+Err:502,Err:502,Err:502,
+#N/A,#N/A,#N/A,
+TRUE,TRUE,TRUE,
+FALSE,FALSE,FALSE,
+42,,42,,
diff --git a/sc/qa/unit/data/ods/cachedValue.ods
b/sc/qa/unit/data/ods/cachedValue.ods
index a802e22..8fe411a 100644
Binary files a/sc/qa/unit/data/ods/cachedValue.ods and
b/sc/qa/unit/data/ods/cachedValue.ods differ
diff --git a/sc/qa/unit/data/ods/matrix.ods b/sc/qa/unit/data/ods/matrix.ods
index d3713cf..4d2f836 100644
Binary files a/sc/qa/unit/data/ods/matrix.ods and
b/sc/qa/unit/data/ods/matrix.ods differ
diff --git a/sc/qa/unit/data/ods/volatile.ods b/sc/qa/unit/data/ods/volatile.ods
deleted file mode 100644
index 6278de7..000
Binary files a/sc/qa/unit/data/ods/volatile.ods and /dev/null differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index a8c37cb..6182bf3 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -133,7 +133,6 @@ public:
void testHardRecalcODS();
void testFunctionsODS();
void testCachedFormulaResultsODS();
-void testVolatileFunctionsODS();
void testCachedMatrixFormulaResultsODS();
void testDatabaseRangesODS();
void testDatabaseRangesXLS();
@@ -188,7 +187,6 @@ public:
CPPUNIT_TEST(testHardRecalcODS);
CPPUNIT_TEST(testFunctionsODS);
CPPUNIT_TEST(testCachedFormulaResultsODS);
-CPPUNIT_TEST(testVolatileFunctionsODS);
CPPUNIT_TEST(testCachedMatrixFormulaResultsODS);
CPPUNIT_TEST(testDatabaseRangesODS);
CPPUNIT_TEST(testDatabaseRangesXLS);
@@ -460,29 +458,40 @@ void ScFiltersTest::testCachedFormulaResultsODS()
createCSVPath(cachedValue., aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
-xDocSh-DoClose();
-}
-}
+//we want to me sure that volatile functions are always recalculated
+//regardless of cached results. if you update the ods file, you must
+//update the values here.
+//if NOW() is recacluated, then it should never equal sTodayCache
+OUString sTodayCache(01/25/13 01:06 PM);
+OUString sTodayRecalc(pDoc-GetString(0,0,1));
-void ScFiltersTest::testVolatileFunctionsODS()
-{
-ScDocShellRef xDocSh = loadDoc(volatile., ODS);
+CPPUNIT_ASSERT(sTodayCache != sTodayRecalc);
-CPPUNIT_ASSERT_MESSAGE(Failed to load volatile.ods, xDocSh.Is());
-ScDocument* pDoc = xDocSh-GetDocument();
-
-//we want to me sure that volatile functions are always recalculated
-//regardless of cached results. if you update the ods file, you must
-//update the values here.
-//if NOW() is recacluated, then it should never equal sTodayCache
-OUString sTodayCache(07/11/12 12:28 AM);
-OUString sTodayRecalc(pDoc-GetString(0,1,0));
-CPPUNIT_ASSERT(sTodayCache != sTodayRecalc);
+OUString sTodayRecalcRef(pDoc-GetString(1,0,1));
+CPPUNIT_ASSERT_EQUAL(sTodayRecalc, sTodayRecalcRef);
-OUString sTodayRecalcRef(pDoc-GetString(2,1,0));
-CPPUNIT_ASSERT(sTodayCache != sTodayRecalcRef);
+// make sure that error values are not being treated as string values
+for(SCCOL nCol = 0; nCol 4; ++nCol)
+{
+for(SCROW nRow = 0; nRow 2; ++nRow)
+{
+
[Libreoffice-commits] .: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UI_cui.mk|1
cui/source/dialogs/dlgname.cxx | 117 +++--
cui/source/dialogs/dlgname.hrc | 36 --
cui/source/dialogs/dlgname.src | 239 --
cui/source/factory/dlgfact.cxx | 17 -
cui/source/inc/cuires.hrc|6
cui/source/inc/dlgname.hxx | 56 +---
cui/source/tabpages/tpbitmap.cxx |5
cui/source/tabpages/tpcolor.cxx |4
cui/source/tabpages/tpgradnt.cxx |5
cui/source/tabpages/tphatch.cxx |5
cui/source/tabpages/tplnedef.cxx |5
cui/uiconfig/ui/namedialog.ui| 506 +++
14 files changed, 588 insertions(+), 415 deletions(-)
New commits:
commit 45dc5f7f4ef579c848a83f5679658977303527bb
Author: Robert Roth robert.roth@gmail.com
Date: Fri Jan 25 03:27:27 2013 +0200
Object name, description dialog and messagebox ported to UI files
Change-Id: Iad23998c9ccde22abad9d894af3dd6df7c92564f
Reviewed-on: https://gerrit.libreoffice.org/1857
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 967d702..92231f6 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/commonlingui.src \
cui/source/dialogs/cuiimapdlg.src \
cui/source/dialogs/cuires.src \
-cui/source/dialogs/dlgname.src \
cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
cui/source/dialogs/grfflt.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index e67ffac..c260e11 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/macroselectordialog \
+ cui/uiconfig/ui/namedialog \
cui/uiconfig/ui/numberingformatpage \
cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 66b465c..a3af8bd 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -24,7 +24,6 @@
#include dlgname.hxx
#include defdlgname.hxx
-#include dlgname.hrc
#include dialmgr.hxx
#define MAX_DESCRIPTION_LINES ((long)5)
@@ -36,40 +35,37 @@
\/
SvxNameDialog::SvxNameDialog( Window* pWindow, const String rName, const
String rDesc ) :
-ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_NAME ) ),
-aFtDescription ( this, CUI_RES( FT_DESCRIPTION ) ),
-aEdtName( this, CUI_RES( EDT_STRING ) ),
-aBtnOK ( this, CUI_RES( BTN_OK ) ),
-aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
-aBtnHelp( this, CUI_RES( BTN_HELP ) )
+ModalDialog ( pWindow, NameDialog, cui/ui/namedialog.ui )
{
-FreeResource();
+get(pBtnOK, ok);
+get(pFtDescription, description_label);
+get(pEdtName, name_entry);
-aFtDescription.SetText( rDesc );
-aEdtName.SetText( rName );
-aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-ModifyHdl(aEdtName);
-aEdtName.SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
+pFtDescription-SetText( rDesc );
+pEdtName-SetText( rName );
+pEdtName-SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
+ModifyHdl(pEdtName);
+pEdtName-SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
// dynamic height of the description field
-Size aSize = aFtDescription.GetSizePixel();
-long nTxtWidth = aFtDescription.GetCtrlTextWidth( rDesc );
+Size aSize = pFtDescription-GetSizePixel();
+long nTxtWidth = pFtDescription-GetCtrlTextWidth( rDesc );
if ( nTxtWidth aSize.Width() )
{
-long nLines = Min( ( nTxtWidth / aSize.Width() + 1 ),
MAX_DESCRIPTION_LINES );
+long nLines = Min( ( nTxtWidth / (aSize.Width()+1) + 1 ),
MAX_DESCRIPTION_LINES );
long nHeight = aSize.Height();
aSize.Height() = nHeight * nLines;
-aFtDescription.SetSizePixel( aSize );
-Point aPnt = aEdtName.GetPosPixel();
+pFtDescription-SetSizePixel( aSize );
+Point aPnt = pEdtName-GetPosPixel();
aPnt.Y() += ( aSize.Height() - nHeight );
-aEdtName.SetPosPixel( aPnt );
+pEdtName-SetPosPixel( aPnt );
}
}
IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
{
if(aCheckNameHdl.IsSet())
-aBtnOK.Enable(aCheckNameHdl.Call(this) 0);
+pBtnOK-Enable(aCheckNameHdl.Call(this) 0);
return 0;
}
@@ -80,31 +76,25 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
SvxObjectNameDialog::SvxObjectNameDialog(
Window* pWindow,
-const String rName)
-: ModalDialog(pWindow, CUI_RES(RID_SVXDLG_OBJECT_NAME)),
-
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 233f3e6d71c5a4c1cdf572198a3303dcc9697be2 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 12:42:40 2013 + Updated core Project: help 6ca6ab572bc8b1ab17b43bb277d4909fed910ed6 diff --git a/helpcontent2 b/helpcontent2 index 7cd661f..6ca6ab5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7cd661f12ff18a7a95573e034d92e025198843a1 +Subproject commit 6ca6ab572bc8b1ab17b43bb277d4909fed910ed6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/shared/01/0519.xhp |2 +- source/text/shared/01/05190100.xhp |7 +++ source/text/shared/01/05200200.xhp |2 +- 4 files changed, 5 insertions(+), 15 deletions(-) New commits: commit 6ca6ab572bc8b1ab17b43bb277d4909fed910ed6 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 12:42:40 2013 + update help ids for various small cui dialogs .ui conversions diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 04bb0a0..8de2f70 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1476,12 +1476,9 @@ HID_DLG_LOGIN,35838, HID_DLG_MAPPING,34842, HID_DLG_MASTERPASSWORD_CRT,35841, HID_DLG_MASTERPASSWORD_UUI,35840, -HID_DLG_MESSBOX,33819, HID_DLG_NAME,33818, HID_DLG_NEWERVERSIONWARNING,35848, HID_DLG_NEW_USER_IDX,54858, -HID_DLG_OBJECT_NAME,33827, -HID_DLG_OBJECT_TITLE_DESC,33828, HID_DLG_ORDERCRIT,38784, HID_DLG_PASSWD_SECTION,53440, HID_DLG_PASSWORD,38964, @@ -7959,9 +7956,6 @@ svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497, svx_Edit_RID_SVXDLG_JAVA_PARAMETER_ED_PARAMETER,1241745419, svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_PREFIX,1368901643, svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_URL,1368901645, -svx_Edit_RID_SVXDLG_NAME_EDT_STRING,1238599681, -svx_Edit_RID_SVXDLG_OBJECT_NAME_NTD_EDT_NAME,1238632450, -svx_Edit_RID_SVXDLG_OBJECT_TITLE_DESC_NTD_EDT_TITLE,1238681603, svx_Edit_RID_SVXDLG_PASSWORD_ED_NEW_PASSWD,1239894037, svx_Edit_RID_SVXDLG_PASSWORD_ED_OLD_PASSWD,1239894027, svx_Edit_RID_SVXDLG_PASSWORD_ED_REPEAT_PASSWD,1239894039, @@ -8447,7 +8441,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_OBJECT_TITLE_DESC_NTD_EDT_DESC,1238682116, 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, @@ -8572,8 +8565,6 @@ svx_PushButton_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDPATH,1241764373, svx_PushButton_RID_SVXDLG_JAVA_CLASSPATH_PB_REMOVE_PATH,1241764374, svx_PushButton_RID_SVXDLG_JAVA_PARAMETER_PB_ASSIGN,1241747980, svx_PushButton_RID_SVXDLG_JAVA_PARAMETER_PB_REMOVE,1241747991, -svx_PushButton_RID_SVXDLG_MESSBOX_BTN_1,1238618625, -svx_PushButton_RID_SVXDLG_MESSBOX_BTN_2,1238618626, svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_ADD_MULTIPATH,1240879630, svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_DEL_MULTIPATH,1240879631, svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_ADD_NAMESPACE,1368887820, diff --git a/source/text/shared/01/0519.xhp b/source/text/shared/01/0519.xhp index 1544deb..37bbba8 100644 --- a/source/text/shared/01/0519.xhp +++ b/source/text/shared/01/0519.xhp @@ -50,7 +50,7 @@ /caseinlinedefaultinlineThe name is also displayed in the Status Bar when you select the object./defaultinline/switchinline/paragraph bookmark xml-lang=en-US branch=hid/SW_HID_FORMAT_NAME_OBJECT_NAME id=bm_id3154422 localize=false/ bookmark xml-lang=en-US branch=hid/SD_HID_SD_NAMEDIALOG_OBJECT id=bm_id3154186 localize=false/ -bookmark xml-lang=en-US branch=hid/cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME id=bm_id8149052 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/objectnamedialog/ObjectNameDialog id=bm_id8149052 localize=false/ paragraph role=heading id=hd_id3156027 xml-lang=en-US level=2 l10n=U oldref=3Name/paragraph paragraph role=paragraph id=par_id3152924 xml-lang=en-US l10n=CHG oldref=4ahelp hid=HID_SD_NAMEDIALOG_OBJECTEnter a name for the selected object. The name will be visible in the Navigator./ahelp/paragraph /body diff --git a/source/text/shared/01/05190100.xhp b/source/text/shared/01/05190100.xhp index 7e350fd..a67b017 100644 --- a/source/text/shared/01/05190100.xhp +++ b/source/text/shared/01/05190100.xhp @@ -32,15 +32,14 @@ bookmark_valuetitles;objects/bookmark_value /bookmarkcommentmw made one index entry out of two objects; entries and made descriptions; a one level entry/comment bookmark xml-lang=en-US branch=hid/.uno:ObjectTitleDescription id=bm_id267952 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:ObjectTitleDescription id=bm_id2231513 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:ObjectTitleDescription id=bm_id1826227 localize=false/paragraph role=heading id=hd_id1115756 xml-lang=en-US level=1 l10n=NEWDescription/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/objecttitledescdialog/ObjectTitleDescDialog id=bm_id1826227 localize=false/paragraph role=heading id=hd_id1115756 xml-lang=en-US level=1 l10n=NEWDescription/paragraph paragraph role=paragraph id=par_id3140354 xml-lang=en-US l10n=NEWahelp hid=.Assigns a title and a description to the selected object. These are accessible for accessibility tools and as alternative tags
[Libreoffice-commits] .: 3 commits - cui/source cui/uiconfig cui/UI_cui.mk
cui/UI_cui.mk|3
cui/source/dialogs/dlgname.cxx | 32 --
cui/source/inc/dlgname.hxx |6
cui/uiconfig/ui/messbox.ui | 109
cui/uiconfig/ui/namedialog.ui| 402 ---
cui/uiconfig/ui/objectnamedialog.ui | 121 +
cui/uiconfig/ui/objecttitledescdialog.ui | 164
7 files changed, 417 insertions(+), 420 deletions(-)
New commits:
commit fbe878da6216028f5943b7863be366adfa0be4fc
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 25 12:25:19 2013 +
hand rolled dynamic positioning code can go now
Change-Id: If30c91ea3828f8e4d8ed4c5ac95697fb2817d68f
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 2b824f2..c841771 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -46,20 +46,6 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String
rName, const String
pEdtName-SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
ModifyHdl(pEdtName);
pEdtName-SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
-
-// dynamic height of the description field
-Size aSize = pFtDescription-GetSizePixel();
-long nTxtWidth = pFtDescription-GetCtrlTextWidth( rDesc );
-if ( nTxtWidth aSize.Width() )
-{
-long nLines = Min( ( nTxtWidth / (aSize.Width()+1) + 1 ),
MAX_DESCRIPTION_LINES );
-long nHeight = aSize.Height();
-aSize.Height() = nHeight * nLines;
-pFtDescription-SetSizePixel( aSize );
-Point aPnt = pEdtName-GetPosPixel();
-aPnt.Y() += ( aSize.Height() - nHeight );
-pEdtName-SetPosPixel( aPnt );
-}
}
IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
@@ -130,8 +116,9 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
|*
\/
-SvxMessDialog::SvxMessDialog( Window* pWindow, const String rText, const
String rDesc, Image* pImg ) :
-ModalDialog ( pWindow, MessBox, cui/ui/messbox.ui )
+SvxMessDialog::SvxMessDialog( Window* pWindow, const String rText, const
String rDesc, Image* pImg )
+: ModalDialog(pWindow, MessBox, cui/ui/messbox.ui)
+, pImage(NULL)
{
get(pBtn1, mess_box_btn1);
get(pBtn2, mess_box_btn2);
@@ -142,8 +129,6 @@ SvxMessDialog::SvxMessDialog( Window* pWindow, const
String rText, const String
pImage = new Image( *pImg );
pFtImage-SetImage( *pImage );
pFtImage-SetStyle( ( pFtImage-GetStyle()/* | WB_NOTABSTOP */)
~WB_3DLOOK );
-pFtImage-SetPosSizePixel( LogicToPixel( Point( 3, 6 ), MAP_APPFONT ),
- pFtImage-GetImage().GetSizePixel() );
pFtImage-Show();
}
@@ -156,8 +141,7 @@ SvxMessDialog::SvxMessDialog( Window* pWindow, const
String rText, const String
SvxMessDialog::~SvxMessDialog()
{
-if( pImage )
-delete pImage;
+delete pImage;
}
/*/
diff --git a/cui/uiconfig/ui/messbox.ui b/cui/uiconfig/ui/messbox.ui
index c40db71..fc7a45a 100644
--- a/cui/uiconfig/ui/messbox.ui
+++ b/cui/uiconfig/ui/messbox.ui
@@ -75,6 +75,7 @@
packing
property name=expandFalse/property
property name=fillTrue/property
+property name=padding12/property
property name=position0/property
/packing
/child
commit 4c05804b2ee2e98c1f2652f88283815a43e9d75e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 25 12:16:06 2013 +
split up into one dialog per .ui
Change-Id: I5473ef07abb1f96aed4cfd96d4fa436ec2f13e64
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index c260e11..d2d7d8b 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -20,10 +20,13 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/macroselectordialog \
+ cui/uiconfig/ui/messbox \
cui/uiconfig/ui/namedialog \
cui/uiconfig/ui/numberingformatpage \
cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
+ cui/uiconfig/ui/objectnamedialog \
+ cui/uiconfig/ui/objecttitledescdialog \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index e6541bd..2b824f2 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -77,9 +77,9 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl)
SvxObjectNameDialog::SvxObjectNameDialog(
Window* pWindow,
const String rName) :
-ModalDialog ( pWindow, ObjectNameDialog, cui/ui/namedialog.ui )
+ModalDialog ( pWindow, ObjectNameDialog,
cui/ui/objectnamedialog.ui )
{
-
[Libreoffice-commits] .: libcdr/ExternalProject_libcdr.mk
libcdr/ExternalProject_libcdr.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit d0c3eaf87f8335a70d25e8cd6e91f2c7d4e47302 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 25 14:47:14 2013 +0200 Blind fix for when using system ICU No point in pointing to nonexistent ICU headers in solver if building against a system ICU. Change-Id: I5a151f3bfefd1913ad84a33d74af749558926312 diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 7bc7377..caf53c6 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -61,8 +61,7 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ export PKG_CONFIG= \ -export ICU_LIBS= \ -export ICU_CFLAGS=-I$(OUTDIR)/inc/external \ +$(if $(filter NO,$(SYSTEM_ICU)), export ICU_LIBS= ICU_CFLAGS=-I$(OUTDIR)/inc/external) \ ./configure \ --with-pic \ --enable-static \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libcdr/ExternalProject_libcdr.mk
libcdr/ExternalProject_libcdr.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a541135d0d843b62a54d0a637d3976a0df437d01 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 25 14:59:02 2013 +0200 Avoid stray in the system ICU case Change-Id: I65a803824fd79cd6ac5136861bba0b64998d0868 diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index caf53c6..4ec7d09 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -61,7 +61,7 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ export PKG_CONFIG= \ -$(if $(filter NO,$(SYSTEM_ICU)), export ICU_LIBS= ICU_CFLAGS=-I$(OUTDIR)/inc/external) \ + $(if $(filter NO,$(SYSTEM_ICU)), export ICU_LIBS= ICU_CFLAGS=-I$(OUTDIR)/inc/external) \ ./configure \ --with-pic \ --enable-static \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - download.lst libcdr/ExternalProject_libcdr.mk libcdr/libcdr-configure.patch.1 libcdr/libcdr-issupported-exception.patch.1 libcdr/libcdr-msvc.patch l
download.lst|4 libcdr/ExternalProject_libcdr.mk|9 libcdr/UnpackedTarball_cdr.mk |8 libcdr/libcdr-configure.patch.1 | 432 libcdr/libcdr-issupported-exception.patch.1 | 43 -- libcdr/libcdr-msvc.patch| 284 -- libcdr/prj/build.lst|2 writerperfect/Library_wpftdraw.mk |3 8 files changed, 13 insertions(+), 772 deletions(-) New commits: commit 0d77df7699bb47c0f36a5d7609433497675b49a3 Author: Petr Mladek pmla...@suse.cz Date: Fri Jan 25 11:53:12 2013 +0100 Uploading libcdr 0.0.10, hoping it works Conflicts: RepositoryExternal.mk libcdr/ExternalProject_libcdr.mk Change-Id: Ibf21b856c0f9da276df60680513421be3c871a2d Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/download.lst b/download.lst index 9989c06..276097f 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a -export CDR_TARBALL := libcdr-0.0.9.tar.bz2 +CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b +export CDR_TARBALL := libcdr-0.0.10.tar.bz2 MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2 VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index f4dcab5..1bf7d23 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj Release|Win32 \ touch $@ else ifeq ($(VCVER),100) @@ -39,6 +40,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ msbuild.exe libcdr.vcxproj /p:Configuration=Release \ touch $@ else @@ -48,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \ touch $@ endif @@ -56,8 +59,10 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ -PKG_CONFIG= \ - ./configure \ +export PKG_CONFIG= \ +export ICU_LIBS= \ +export ICU_CFLAGS=-I$(OUTDIR)/inc/external \ +./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index b8b6726..be1e7d7 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-configure.patch.1 \ - libcdr/libcdr-issupported-exception.patch.1 \ - libcdr/libcdr-msvc.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-configure.patch.1 b/libcdr/libcdr-configure.patch.1 deleted file mode 100644 index ef751fc..000 --- a/libcdr/libcdr-configure.patch.1 +++ /dev/null @@ -1,432 +0,0 @@ cdr/configure 2012-10-05 21:47:11.246958344 +0200 -+++ cdr/configure 2012-10-05 22:05:33.913874511 +0200 -@@ -637,6 +617,7 @@ - DOXYGEN - STATIC_TOOLS_FALSE - STATIC_TOOLS_TRUE -+LIBCDR_LIBS - LIBCDR_CXXFLAGS - DEBUG_CXXFLAGS - WINDRES -@@ -658,8 +639,12 @@ - CDR_MAJOR_VERSION - ZLIB_LIBS - ZLIB_CFLAGS --LIBCDR_LIBS --LIBCDR_CFLAGS -+LCMS2_LIBS -+LCMS2_CFLAGS -+WPG_LIBS -+WPG_CFLAGS -+WPD_LIBS -+WPD_CFLAGS - PKG_CONFIG_LIBDIR - PKG_CONFIG_PATH - PKG_CONFIG -@@ -816,8 +801,12 @@ - PKG_CONFIG - PKG_CONFIG_PATH - PKG_CONFIG_LIBDIR --LIBCDR_CFLAGS --LIBCDR_LIBS -+WPD_CFLAGS -+WPD_LIBS -+WPG_CFLAGS -+WPG_LIBS -+LCMS2_CFLAGS -+LCMS2_LIBS - ZLIB_CFLAGS - ZLIB_LIBS' - -@@ -1481,9 +1472,13 @@ - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path -- LIBCDR_CFLAGS -- C
[Libreoffice-commits] .: 2 commits - cui/source vcl/inc vcl/source
cui/source/inc/helpid.hrc |4
vcl/inc/svids.hrc |2 ++
vcl/source/control/button.cxx | 20 +---
vcl/source/src/btntext.src| 19 ++-
4 files changed, 29 insertions(+), 16 deletions(-)
New commits:
commit 14d8cd11d6b4831811dbaeb6cfa1f81392251abe
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 25 13:42:13 2013 +
Resolves: rhbz#902694 impossible short-cuts for OK/Cancel translations
auto-adding mnemonics to the first character of OK/Cancel translations
suggests
short-cuts under various CJK/Indic languages which can't be achieved with a
single keystroke combination
Some platforms want mnemonic-ed OK/Cancel, some don't. So lets have two
translations, one for each situation, rather than trying to automunge.
Change-Id: I23e21e79b27ead86f535309ca0efc2adea86ae24
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 27e5e0a..064cd53 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -156,6 +156,8 @@
#define SV_BUTTONTEXT_NEW 10115
#define SV_BUTTONTEXT_EDIT 10116
#define SV_BUTTONTEXT_APPLY 10117
+#define SV_BUTTONTEXT_OK_NOMNEMONIC 10118
+#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC 10119
#define SV_STDTEXT_FIRSTSV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10200
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1cc10af..e2f8b76 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -143,18 +143,16 @@ OUString Button::GetStandardText( StandardButtonType
eButton )
}
sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
-OUString aText = ResId(nResId, *pResMgr).toString();
-
-if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
-{
-#ifndef WNT
-// Windows (apparently) has some magic auto-accelerator evil around
-// ok / cancel so add accelerators only for Unix
-if (aText.indexOf('~') == -1)
-return ~ + aText;
+#ifdef WNT
+//
http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
+// Under windows we don't want accelerators on ok/cancel but do on other
+// buttons
+if (nResId == SV_BUTTONTEXT_OK)
+nResId = SV_BUTTONTEXT_OK_NOMNEMONIC;
+else if (nResId == SV_BUTTONTEXT_CANCEL)
+nResId = SV_BUTTONTEXT_CANCEL_NOMNEMONIC;
#endif
-}
-return aText;
+return ResId(nResId, *pResMgr).toString();
}
// ---
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 5f93307..a16fc70 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -18,13 +18,30 @@
#include svids.hrc
+//http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
+//Special OK/Cancel handling
+
String SV_BUTTONTEXT_OK
{
-Text [ en-US ] = OK;
+Text [ x-comment ] = This is used on buttons for platforms other than
windows, there should be a ~ mnemonic in this string;
+Text [ en-US ] = ~OK;
};
String SV_BUTTONTEXT_CANCEL
{
+Text [ x-comment ] = This is used on buttons for platforms other than
windows, there should be a ~ mnemonic in this string;
+Text [ en-US ] = ~Cancel;
+};
+
+String SV_BUTTONTEXT_OK_NOMNEMONIC
+{
+Text [ x-comment ] = This is used on buttons for Windows, there should be
no ~ mnemonic in this string;
+Text [ en-US ] = OK;
+};
+
+String SV_BUTTONTEXT_CANCEL_NOMNEMONIC
+{
+Text [ x-comment ] = This is used on buttons for Windows, there should be
no ~ mnemonic in this string;
Text [ en-US ] = Cancel;
};
commit 610ebd9a1100095b81835a476465b6ef126e8e1e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 25 12:44:20 2013 +
remove redundant HIDs
Change-Id: I982b760084cf9ed259432b7c77a865e3f8f13fed
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 82c1567..c1ab0c6 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -190,13 +190,9 @@
#define HID_CHARMAP_CTL_SHOWSET CUI_HID_CHARMAP_CTL_SHOWSET
#define HID_CHARMAP_CTL_SHOWTEXT CUI_HID_CHARMAP_CTL_SHOWTEXT
#define HID_CHARMAP_CTL_SHOWCHAR CUI_HID_CHARMAP_CTL_SHOWCHAR
-#define HID_DLG_NAME CUI_HID_DLG_NAME
-#define HID_DLG_MESSBOX CUI_HID_DLG_MESSBOX
#define HID_HANGULDLG_SUGGESTIONS CUI_HID_HANGULDLG_SUGGESTIONS
#define HID_HANGULDLG_SUGGESTIONS_GRID CUI_HID_HANGULDLG_SUGGESTIONS_GRID
#define HID_HANGULDLG_SUGGESTIONS_LIST CUI_HID_HANGULDLG_SUGGESTIONS_LIST
-#define HID_DLG_OBJECT_NAME CUI_HID_DLG_OBJECT_NAME
-#define HID_DLG_OBJECT_TITLE_DESC CUI_HID_DLG_OBJECT_TITLE_DESC
#define HID_SVX_CONFIG_MENU_ORGANIZER CUI_HID_SVX_CONFIG_MENU_ORGANIZER
#define HID_SVX_CONFIG_ICON_SELECTOR CUI_HID_SVX_CONFIG_ICON_SELECTOR
#define HID_SVX_CONFIG_NAME_SUBMENU CUI_HID_SVX_CONFIG_NAME_SUBMENU
Re: Windows magic auto-accelerator evil ?
On Thu, 2013-01-24 at 19:05 +0100, Andras Timar wrote: I don't understand why we need mnemonics for OK/Cancel in the first place, because ENTER is the shortcut for OK, and ESC is the shortcut for Cancel always. Well I suppose, if the focus is a button other than ok or inside an multiline edit then enter doesn't activate ok. Some platforms want them and some don't, *shrug*, I added the strings as 14d8cd11d6b4831811dbaeb6cfa1f81392251abe hopefully that's not controversial and will stop us suggesting impossible shortcuts. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 54617ada5c91c442e73f0b652a6e50f8c27ac107
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jan 24 16:50:32 2013 +0100
Template Manager: remote repositories only for experimental mode
Change-Id: I79501bdcd25f362065d9b95efd1a43f6be84577e
Reviewed-on: https://gerrit.libreoffice.org/1847
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f1e69f5..833e556 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -30,6 +30,7 @@
#include sfx2/thumbnailviewitem.hxx
#include sot/storage.hxx
#include svtools/imagemgr.hxx
+#include svtools/miscopt.hxx
#include svtools/PlaceEditDialog.hxx
#include tools/urlobj.hxx
#include unotools/moduleoptions.hxx
@@ -177,6 +178,13 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
+SvtMiscOptions aMiscOptions;
+if ( !aMiscOptions.IsExperimentalMode() )
+{
+sal_uInt16 nPos = mpViewBar-GetItemId(TBI_TEMPLATE_REPOSITORY);
+mpViewBar-RemoveItem(nPos);
+}
+
mpViewBar-Show();
mpActionBar-Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/uiconfig helpcontent2
cui/uiconfig/ui/numberingoptionspage.ui | 233 +--- helpcontent2|2 2 files changed, 130 insertions(+), 105 deletions(-) New commits: commit 09b72749f45f519da5cf26275db6745a491c4265 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 14:22:13 2013 + add mnemonic widgets in numbering options page Change-Id: I84c1fa8f24504a06563145e224d01abaa5714cf9 diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index aecf877..3353bf8 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -26,6 +26,26 @@ property name=step_increment1/property property name=page_increment10/property /object + object class=GtkMenu id=bitmapmenu +property name=visibleTrue/property +property name=can_focusFalse/property +child + object class=GtkMenuItem id=fromfile +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesFrom file.../property +property name=use_underlineTrue/property + /object +/child +child + object class=GtkMenuItem id=gallery +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesGallery/property +property name=use_underlineTrue/property + /object +/child + /object object class=GtkBox id=NumberingOptionsPage property name=visibleTrue/property property name=can_focusFalse/property @@ -105,6 +125,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesNumber/property +property name=use_underlineTrue/property +property name=mnemonic_widgetnumfmtlb/property /object packing property name=left_attach0/property @@ -119,6 +141,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesCharacter Style/property +property name=use_underlineTrue/property +property name=mnemonic_widgetcharstyle/property /object packing property name=left_attach0/property @@ -133,6 +157,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesShow sublevels/property +property name=use_underlineTrue/property +property name=mnemonic_widgetsublevels/property /object packing property name=left_attach0/property @@ -142,20 +168,6 @@ /packing /child child - object class=GtkLabel id=separator -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesSeparator/property - /object - packing -property name=left_attach0/property -property name=top_attach7/property -property name=width2/property -property name=height1/property - /packing -/child -child object class=GtkComboBox id=charstyle property name=visibleTrue/property property name=can_focusFalse/property @@ -184,34 +196,6 @@ /packing /child child - object class=GtkEntry id=prefix -property name=visibleTrue/property -property name=can_focusTrue/property -property name=invisible_charâ/property -property name=invisible_char_setTrue/property - /object - packing -property name=left_attach1/property -property name=top_attach8/property -property name=width1/property -property
[Libreoffice-commits] .: helpers/help_hid.lst source/text
helpers/help_hid.lst | 19 -- source/text/shared/01/06050500.xhp | 67 ++--- 2 files changed, 34 insertions(+), 52 deletions(-) New commits: commit 745c3e5b1fdaa4882b4609d303cace6763e063e8 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 14:31:36 2013 + update help ids for numbering options page .ui conversion diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8de2f70..64db3e0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3889,7 +3889,6 @@ HID_STYLIST_NEW,33176, HID_SVXDLG_FILTER_WARNING,34195, HID_SVXPAGE_GRFCROP,34143, HID_SVXPAGE_JSEARCH_OPTIONS,34188, -HID_SVXPAGE_NUM_OPTIONS,34057, HID_SVXPAGE_NUM_POSITION,34058, HID_SVXPAGE_PARA_ASIAN,34174, HID_SVXPAGE_PICK_BMP,34055, @@ -7856,8 +7855,6 @@ svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_VARIANT_FORM_KANJI,714474603, svx_CheckBox_RID_SVXPAGE_LINE_CBX_SYNCHRONIZE,701547521, svx_CheckBox_RID_SVXPAGE_LINE_CB_SYMBOL_RATIO,701547544, svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905, -svx_CheckBox_RID_SVXPAGE_NUM_OPTIONS_CB_RATIO,704300209, -svx_CheckBox_RID_SVXPAGE_NUM_OPTIONS_CB_SAME_LEVEL,704300220, svx_CheckBox_RID_SVXPAGE_NUM_POSITION_CB_RELATIVE,704316601, svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK,705594379, svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTODOWNLOAD,705594384, @@ -8000,8 +7997,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEARCH_NAME,703334441, svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448, svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446, svx_Edit_RID_SVXPAGE_LINEEND_DEF_EDT_NAME,701581313, -svx_Edit_RID_SVXPAGE_NUM_OPTIONS_ED_PREFIX,704301212, -svx_Edit_RID_SVXPAGE_NUM_OPTIONS_ED_SUFFIX,704301216, svx_Edit_RID_SVXPAGE_TABULATOR_ED_FILLCHAR_OTHER,700745773, svx_Edit_RID_SVXPAGE_TABULATOR_ED_TABTYPE_DECCHAR,700745756, svx_Edit_RID_SVXTABPAGE_GALLERY_GENERAL_EDT_MS_NAME,706627585, @@ -8223,11 +8218,6 @@ svx_ListBox_RID_SVXPAGE_LINE_LB_START_STYLE,701550083, svx_ListBox_RID_SVXPAGE_MEASURE_LB_UNIT,703352321, svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS,705498935, svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN,705498948, -svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_ALIGN,704302643, -svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_BUL_COLOR,704302783, -svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_CHARFMT,704302760, -svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_FMT,704302750, -svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_ORIENT,704302775, svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN,704319027, svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN_2,704319231, svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_LABEL_FOLLOWED_BY,704319227, @@ -8258,9 +8248,7 @@ svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT,2311860263, svx_MenuButton_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,701558810, svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE,705507642, svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY,705507646, -svx_MenuButton_RID_SVXPAGE_NUM_OPTIONS_MB_BITMAP,704311480, svx_Menu_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,537296896, -svx_Menu_RID_SVXPAGE_NUM_OPTIONS_MB_BITMAP,539885568, svx_MetricBox_RID_SVXPAGE_TABULATOR_ED_TABPOS,700753418, svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208, svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158, @@ -8356,9 +8344,6 @@ svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE2_LEN,703355397, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_DIST,703355395, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_OVERHANG,703355394, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_LINE_DIST,703355393, -svx_MetricField_RID_SVXPAGE_NUM_OPTIONS_MF_BUL_REL_SIZE,704305857, -svx_MetricField_RID_SVXPAGE_NUM_OPTIONS_MF_HEIGHT,704305845, -svx_MetricField_RID_SVXPAGE_NUM_OPTIONS_MF_WIDTH,704305843, svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_ALIGNED_AT,704322305, svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_BORDERDIST,704322210, svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_INDENT,704322214, @@ -8447,7 +8432,6 @@ svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719, svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925, svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761, svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES,809159812, -svx_MultiListBox_RID_SVXPAGE_NUM_OPTIONS_LB_LEVEL,704302232, svx_MultiListBox_RID_SVXPAGE_NUM_POSITION_LB_LEVEL,704318616, svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761, svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874, @@ -8489,8 +8473,6 @@ svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X,703207437, svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y,703207438, svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_1,701569025, svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026, -svx_NumericField_RID_SVXPAGE_NUM_OPTIONS_ED_START,704305323, -svx_NumericField_RID_SVXPAGE_NUM_OPTIONS_NF_ALL_LEVEL,704305321, svx_NumericField_RID_SVXPAGE_TEXTANIMATION_NUM_FLD_COUNT,703731713,
[Libreoffice-commits] .: sw/source
sw/source/core/doc/poolfmt.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b0a2b73222482d1379e90b636efdf44a48ba3ab6 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Fri Jan 25 15:08:30 2013 +0100 fdo#59779: Set the first page attributes on pooled styles creation diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index fc8f1b4..38683a3 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1597,6 +1597,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage ) if( bSetLeft ) pNewPgDsc-GetLeft().SetFmtAttr( aSet ); pNewPgDsc-GetMaster().SetFmtAttr( aSet ); +pNewPgDsc-GetFirst().SetFmtAttr( aSet ); } } return pNewPgDsc; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Google developer account
I am greatly looking forward to this :) as it means i wont have to stay lugging around a laptop to do work on, but can use my tablet instead :) Hope to see LO on android very soon :) On Thu, Jan 24, 2013 at 10:23 AM, Florian Effenberger flo...@documentfoundation.org wrote: Hi, Robinson Tryon wrote on 2013-01-23 20:39: Looks like the minutes from the board meeting haven't been posted yet -- could you please give us a quick rundown of what the board has decided? (Information about Android support has arguably been*the* hottest topic on the Ask.LO site) the minutes are not approved, thus not published yet, but the board's decision was to set-up an official TDF account at the Google Play store, so we can offer Android applications there. What I had in mind of course was the Impress Remote, but it must not be limited to that. So, basically, TDF has now the option of putting software into the Play store, and I hope we make use of it. :) Florian __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - sw/source
sw/source/core/text/portxt.cxx |4 ++--
sw/source/core/txtnode/fntcache.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 80a9fe652bff8fb9ff6e010a29f24a0afc362ea7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 24 12:26:28 2013 +
Resolves: fdo#59586 Missing comma in particular PDF file
regression from d9e4c74811855de15f1bf2045c2c9b061a2d4dc6
- if ( LANGUAGE_KOREAN != aLang LANGUAGE_KOREAN_JOHAB != aLang )
+ if (MsLangId::isKorean(aLang))
should obviously have been
- if ( LANGUAGE_KOREAN != aLang LANGUAGE_KOREAN_JOHAB != aLang )
+ if (!MsLangId::isKorean(aLang))
Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81
(cherry picked from commit e029e7394b972fd72930c8c475f3768dd99fe673)
Reviewed-on: https://gerrit.libreoffice.org/1839
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit f3a0e72261419554d0cd3984a0e8f800ed587d49)
Reviewed-on: https://gerrit.libreoffice.org/1845
Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 7842c11..293d348 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -94,7 +94,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo rInf,
const XubString* pStr
LanguageType aLang =
rInf.GetTxtFrm()-GetTxtNode()-GetLang( rInf.GetIdx(), 1, nScript
);
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
const SwLinePortion* pPor = rPor.GetPortion();
if ( pPor ( pPor-IsKernPortion() ||
@@ -202,7 +202,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo rInf,
const XubString* pStr
LanguageType aLang =
rInf.GetTxtFrm()-GetTxtNode()-GetLang( nPos, 1, nNextScript
);
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
++nCnt;
}
}
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 10bb745..3609b8b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1085,7 +1085,7 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
if ( ( SW_CJK == nActual || SW_LATIN == nActual )
nSpaceAdd )
{
LanguageType aLang = rInf.GetFont()-GetLanguage(
SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -1261,7 +1261,7 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -1472,7 +1472,7 @@ void SwFntObj::DrawText( SwDrawTextInfo rInf )
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -2042,7 +2042,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo rInf )
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/stylesbuffer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 32ad991fd4f12f03120e8f3a416ee06fb7c3
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Fri Jan 25 07:12:44 2013 -0200
Only call getScDocument when needed
Change-Id: I2dca76af46e63b5dd833f5a60549d4b1a7b03d84
Reviewed-on: https://gerrit.libreoffice.org/1861
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index bb3672d..3657f9b 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2715,11 +2715,11 @@ void CellStyle::createCellStyle()
if( !mbCreated )
mbCreated = maFinalName.isEmpty();
-::ScDocument rDoc = getScDocument();
if( !mbCreated !mpStyleSheet )
{
bool bCreatePattern = false;
Xf* pXF = getStyles().getStyleXf( maModel.mnXfId ).get();
+::ScDocument rDoc = getScDocument();
bool bDefStyle = maModel.isDefaultStyle();
if( bDefStyle )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - filter/inc sc/source
filter/inc/filter/msfilter/msdffimp.hxx |3 ++-
sc/source/filter/excel/xeescher.cxx |8 +---
sc/source/filter/excel/xiescher.cxx | 12 +++-
sc/source/filter/inc/drawingbase.hxx | 20 +++-
sc/source/filter/inc/xiescher.hxx|2 +-
sc/source/filter/oox/drawingbase.cxx | 13 +++--
sc/source/filter/oox/drawingfragment.cxx |9 +
7 files changed, 50 insertions(+), 17 deletions(-)
New commits:
commit 701cc2aa454b700f9e837d9ee3043598505a1405
Author: Noel Power noel.po...@suse.com
Date: Fri Jan 25 15:17:47 2013 +
export page/cell anchoring for xls drawing objects fdo#58360
Change-Id: I8f12ce4fedd3da76bab683ac85169186deeb89dc
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 32afdab..4221d0c 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -257,9 +257,11 @@ XclExpDffSheetAnchor::XclExpDffSheetAnchor( const
XclExpRoot rRoot ) :
void XclExpDffSheetAnchor::ImplSetFlags( const SdrObject rSdrObj )
{
-// Special case page anchor (X==0,Y==1) - lock pos and size.
-const Point rPos = rSdrObj.GetAnchorPos();
-mnFlags = ((rPos.X() == 0) (rPos.Y() == 1)) ? EXC_ESC_ANCHOR_LOCKED : 0;
+// set flags for cell/page anchoring
+if ( ScDrawLayer::GetAnchorType( rSdrObj ) == SCA_CELL )
+mnFlags = 0;
+else
+mnFlags = EXC_ESC_ANCHOR_LOCKED;
}
void XclExpDffSheetAnchor::ImplCalcAnchorRect( const Rectangle rRect, MapUnit
eMapUnit )
commit 55f0c9e03250cf7563b37de9953fe239dceb4ba3
Author: Noel Power noel.po...@suse.com
Date: Fri Jan 25 11:29:45 2013 +
import page/cell anchoring for xlsx drawing objects fdo#58360
Change-Id: I5f6cf9c5f28e8176c1057d50e39c67202bf1f143
diff --git a/sc/source/filter/inc/drawingbase.hxx
b/sc/source/filter/inc/drawingbase.hxx
index 9f392a6..de19882 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -79,6 +79,14 @@ struct AnchorClientDataModel
class ShapeAnchor : public WorksheetHelper
{
public:
+enum AnchorType
+{
+ANCHOR_INVALID, /// Anchor type is unknown.
+ANCHOR_ABSOLUTE,/// Absolute anchor (top-left corner and size
in absolute units).
+ANCHOR_ONECELL, /// One-cell anchor (top-left corner at cell,
size in absolute units).
+ANCHOR_TWOCELL, /// Two-cell anchor (top-left and bottom-right
corner at cell).
+ANCHOR_VML
+};
explicitShapeAnchor( const WorksheetHelper rHelper );
/** Imports the shape anchor (one of the elements xdr:absoluteAnchor,
xdr:oneCellAnchor, xdr:twoCellAnchor). */
@@ -100,19 +108,13 @@ public:
/** Calculates the resulting shape anchor in 1/100 mm. */
::com::sun::star::awt::Rectangle calcAnchorRectHmm(
const ::com::sun::star::awt::Size rPageSizeHmm )
const;
+AnchorType getEditAs() const { return meEditAs; }
private:
/** Converts the passed anchor to an absolute position in EMUs. */
::oox::drawingml::EmuPoint calcCellAnchorEmu( const CellAnchorModel
rModel ) const;
private:
-enum AnchorType
-{
-ANCHOR_INVALID, /// Anchor type is unknown.
-ANCHOR_ABSOLUTE,/// Absolute anchor (top-left corner and size
in absolute units).
-ANCHOR_ONECELL, /// One-cell anchor (top-left corner at cell,
size in absolute units).
-ANCHOR_TWOCELL, /// Two-cell anchor (top-left and bottom-right
corner at cell).
-ANCHOR_VML
-};
+
/** Specifies how cell positions from CellAnchorModel have to be
processed. */
enum CellAnchorType
@@ -129,7 +131,7 @@ private:
CellAnchorModel maFrom; /// Top-left position, if anchor
is not of type absolute.
CellAnchorModel maTo; /// Bottom-right position, if
anchor is of type two-cell.
AnchorClientDataModel maClientData; /// Shape client data.
-sal_Int32 mnEditAs; /// Anchor mode as shown in the UI.
+AnchorType meEditAs; /// Anchor mode as shown in the UI.
};
//
diff --git a/sc/source/filter/oox/drawingbase.cxx
b/sc/source/filter/oox/drawingbase.cxx
index b035ec8..f0a5f7d 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -79,7 +79,7 @@ ShapeAnchor::ShapeAnchor( const WorksheetHelper rHelper ) :
WorksheetHelper( rHelper ),
meAnchorType( ANCHOR_INVALID ),
meCellAnchorType( CELLANCHOR_EMU ),
-mnEditAs( XML_twoCell )
+meEditAs( ANCHOR_TWOCELL )
{
}
@@ -94,8 +94,17 @@ void ShapeAnchor::importAnchor( sal_Int32 nElement, const
AttributeList rAttrib
meAnchorType = ANCHOR_ONECELL;
break;
case XDR_TOKEN( twoCellAnchor ):
+{
[Libreoffice-commits] .: 4 commits - libcdr/ExternalProject_libcdr.mk libcdr/libcdr-0.0.10-ellipse.patch libcdr/UnpackedTarball_cdr.mk
libcdr/ExternalProject_libcdr.mk |4 +++-
libcdr/UnpackedTarball_cdr.mk |6 ++
libcdr/libcdr-0.0.10-ellipse.patch | 19 +++
3 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 302eebf0c88251a1514840a01a73316d898a6709
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 25 16:56:55 2013 +0100
CDR: Actually apply the patch
Change-Id: I9ffd7123b8f79128c559f30eade6ae49bf809981
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..541fa96 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+ libcdr/libcdr-0.0.10-ellipse.patch \
+))
+
# vim: set noet sw=4 ts=4:
commit 7a50b16839f96a3afdb4be699b3c429c0510881a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 25 16:43:12 2013 +0100
CDR: We want ICU_LIBS always empty since this is a static library
Change-Id: I90730e08b07182fa73a1e3a60bed6da11cfd9e06
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 2c207c4..e8736d6 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -61,8 +61,9 @@ else
$(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
export PKG_CONFIG= \
- $(if $(filter NO,$(SYSTEM_ICU)), export ICU_LIBS=
ICU_CFLAGS=-I$(OUTDIR)/inc/external) \
- $(if $(filter YES,$(SYSTEM_ICU)), export ICU_LIBS= ICU_CFLAGS= )
\
+export ICU_LIBS= \
+ $(if $(filter NO,$(SYSTEM_ICU)), export
ICU_CFLAGS=-I$(OUTDIR)/inc/external) \
+ $(if $(filter YES,$(SYSTEM_ICU)), ICU_CFLAGS= ) \
./configure \
--with-pic \
--enable-static \
commit f1ebdbd541225f1f31334114f3456d0fd7572eb7
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 25 16:23:44 2013 +0100
CDR: Override pkg-config with SYSTEM_ICU
Change-Id: I8c802ae3ee91978bb445a47ba80c64eef355907b
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 4ec7d09..2c207c4 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -62,6 +62,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
export PKG_CONFIG= \
$(if $(filter NO,$(SYSTEM_ICU)), export ICU_LIBS=
ICU_CFLAGS=-I$(OUTDIR)/inc/external) \
+ $(if $(filter YES,$(SYSTEM_ICU)), export ICU_LIBS= ICU_CFLAGS= )
\
./configure \
--with-pic \
--enable-static \
commit ab0195a5a40e441dea72cc2950e74cbd777115d5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 25 16:17:29 2013 +0100
CDR: fix large-angle computation
Change-Id: Ia3f937b0b49093fbdbbe259b835a2d8a81633fe1
diff --git a/libcdr/libcdr-0.0.10-ellipse.patch
b/libcdr/libcdr-0.0.10-ellipse.patch
new file mode 100644
index 000..0b392a7
--- /dev/null
+++ b/libcdr/libcdr-0.0.10-ellipse.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/CDRParser.cpp
b/src/lib/CDRParser.cpp
+@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream
*input)
+ double rx = fabs(cx);
+ double ry = fabs(cy);
+
++ while (angle1 0.0)
++angle1 += 2*M_PI;
++ while (angle1 2*M_PI)
++angle1 -= 2*M_PI;
++
++ while (angle2 0.0)
++angle2 += 2*M_PI;
++ while (angle2 2*M_PI)
++angle2 -= 2*M_PI;
++
+ if (angle1 != angle2)
+ {
+ if (angle2 angle1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - chart2/source
chart2/source/model/filter/XMLFilter.cxx | 40 ++-
1 file changed, 19 insertions(+), 21 deletions(-)
New commits:
commit 5f94c53986276dbb6164bb0da887926d242418fe
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jan 24 22:24:44 2013 -0500
bnc#798271: Don't delete the PropertyMapEntry instance prematurely.
When using comphelper::PropertyMapEntry array to create a UNO property
set, we need to make sure we keep this instance while the property set
object is alive, else it would cause a very hard-to-debug problem down
the road...
In this particular case, the aExportInfoMap array instance was destroyed
when it went out of scope, but the xInfoSet which references it was used
afterward.
Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
Reviewed-on: https://gerrit.libreoffice.org/1860
Reviewed-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 10a565a..75692c4 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -631,28 +631,26 @@ sal_Int32 XMLFilter::impl_Export(
xServiceFactory-createInstanceWithArguments(
C2U(com.sun.star.comp.Svx.GraphicExportHelper),
aGraphicResolverArgs ), uno::UNO_QUERY );
-uno::Reference beans::XPropertySet xInfoSet;
+// property map for export info set
+comphelper::PropertyMapEntry aExportInfoMap[] =
{
-// property map for export info set
-comphelper::PropertyMapEntry aExportInfoMap[] =
-{
-{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0
), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(ExportTableNumberList), 0,
::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ NULL, 0, 0, NULL, 0, 0 }
-};
-
-xInfoSet = comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
-
-SvtSaveOptions aSaveOpt;
-OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
-sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
-if( ! bOasis )
-xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
-}
+{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(ExportTableNumberList), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ NULL, 0, 0, NULL, 0, 0 }
+};
+
+uno::Reference beans::XPropertySet xInfoSet =
+comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
+
+SvtSaveOptions aSaveOpt;
+OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
+sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
+if( ! bOasis )
+xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
sal_Int32 nArgs = 2;
if( xGraphicObjectResolver.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - libcdr/ExternalProject_libcdr.mk libcdr/libcdr-0.0.10-ellipse.patch libcdr/UnpackedTarball_cdr.mk
libcdr/ExternalProject_libcdr.mk |3 ++-
libcdr/UnpackedTarball_cdr.mk |6 ++
libcdr/libcdr-0.0.10-ellipse.patch | 19 +++
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 36e31ab6551579bf69012d0ba803fcb5fb17a062
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jan 25 16:17:29 2013 +0100
CDR: fix large-angle computation
Change-Id: Ia3f937b0b49093fbdbbe259b835a2d8a81633fe1
Blind fix for when using system ICU
No point in pointing to nonexistent ICU headers in solver if building
against a system ICU.
Change-Id: I5a151f3bfefd1913ad84a33d74af749558926312
CDR: Override pkg-config with SYSTEM_ICU
Change-Id: I665412f7d79247f6558337ac80bd866d2cfc3dce
CDR: We want ICU_LIBS always empty since this is a static library
Change-Id: I90730e08b07182fa73a1e3a60bed6da11cfd9e06
CDR: Actually apply the patch
Change-Id: I9ffd7123b8f79128c559f30eade6ae49bf809981
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 1bf7d23..9193c3c 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -61,7 +61,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR) \
export PKG_CONFIG= \
export ICU_LIBS= \
-export ICU_CFLAGS=-I$(OUTDIR)/inc/external \
+ $(if $(filter NO,$(SYSTEM_ICU)), export
ICU_CFLAGS=-I$(OUTDIR)/inc/external) \
+ $(if $(filter YES,$(SYSTEM_ICU)), ICU_CFLAGS= ) \
./configure \
--with-pic \
--enable-static \
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..541fa96 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+ libcdr/libcdr-0.0.10-ellipse.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.10-ellipse.patch
b/libcdr/libcdr-0.0.10-ellipse.patch
new file mode 100644
index 000..0b392a7
--- /dev/null
+++ b/libcdr/libcdr-0.0.10-ellipse.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/CDRParser.cpp
b/src/lib/CDRParser.cpp
+@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream
*input)
+ double rx = fabs(cx);
+ double ry = fabs(cy);
+
++ while (angle1 0.0)
++angle1 += 2*M_PI;
++ while (angle1 2*M_PI)
++angle1 -= 2*M_PI;
++
++ while (angle2 0.0)
++angle2 += 2*M_PI;
++ while (angle2 2*M_PI)
++angle2 -= 2*M_PI;
++
+ if (angle1 != angle2)
+ {
+ if (angle2 angle1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - cui/uiconfig helpcontent2
cui/uiconfig/ui/addcommands.ui | 213 - cui/uiconfig/ui/addsubmenu.ui| 115 --- cui/uiconfig/ui/macroselector.ui | 226 --- cui/uiconfig/ui/numberingpositionpage.ui | 93 +++- cui/uiconfig/ui/renamemenu.ui| 114 --- cui/uiconfig/ui/renametoolbar.ui | 114 --- helpcontent2 |2 7 files changed, 57 insertions(+), 820 deletions(-) New commits: commit 8c79af8df5dd9428d8dc8cc3693c17ecb992383a Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 16:43:31 2013 + add mnemonic widgets in numbering position page and restore lost short-cuts Change-Id: I86221fc67095fda8a8cbcfbc10bb0ff61c818e3f diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui index 057ff28..9dc640d 100644 --- a/cui/uiconfig/ui/numberingpositionpage.ui +++ b/cui/uiconfig/ui/numberingpositionpage.ui @@ -12,40 +12,6 @@ property name=step_increment0.050003/property property name=page_increment10/property /object - object class=GtkListStore id=liststore1 -columns - !-- column-name gchararray1 -- - column type=gchararray/ -/columns -data - row -col id=0 translatable=yesLeft/col - /row - row -col id=0 translatable=yesCentered/col - /row - row -col id=0 translatable=yesRight/col - /row -/data - /object - object class=GtkListStore id=liststore2 -columns - !-- column-name gchararray1 -- - column type=gchararray/ -/columns -data - row -col id=0 translatable=yesTab stop/col - /row - row -col id=0 translatable=yesSpace/col - /row - row -col id=0 translatable=yesNothing/col - /row -/data - /object object class=GtkBox id=NumberingPositionPage property name=visibleTrue/property property name=can_focusFalse/property @@ -126,6 +92,8 @@ property name=hexpandTrue/property property name=xalign0/property property name=label translatable=yesNumbering followed by/property +property name=use_underlineTrue/property +property name=mnemonic_widgetnumfollowedbylb/property /object packing property name=left_attach0/property @@ -139,7 +107,9 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesNumbering Alignment/property +property name=label translatable=yesN_umbering Alignment/property +property name=use_underlineTrue/property +property name=mnemonic_widgetnum2alignlb/property /object packing property name=left_attach0/property @@ -154,6 +124,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesAligned at/property +property name=use_underlineTrue/property +property name=mnemonic_widgetalignedatmf:0.00cm/property /object packing property name=left_attach0/property @@ -168,6 +140,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesIndent at/property +property name=use_underlineTrue/property +property name=mnemonic_widgetindentatmf:0.00cm/property /object packing property name=left_attach0/property @@ -209,6 +183,8 @@ property name=can_focusFalse/property property name=xalign1/property property name=label translatable=yesat/property +property name=use_underlineTrue/property +property name=mnemonic_widgetatmf:0.00cm/property /object packing property name=left_attach0/property @@ -297,6 +273,8 @@ property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesIndent/property +property name=use_underlineTrue/property +property name=mnemonic_widgetindentmf:0.00cm/property /object packing property name=left_attach0/property @@ -322,11 +300,12 @@ /child
[Libreoffice-commits] .: helpers/help_hid.lst source/text
helpers/help_hid.lst | 13 - source/text/shared/01/06050600.xhp | 28 +++- 2 files changed, 15 insertions(+), 26 deletions(-) New commits: commit 351c2d40cc93737f988ba2b35d0ca26d511f296c Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 16:39:59 2013 + update help ids for numbering position page .ui conversion diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 64db3e0..1036342 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3889,7 +3889,6 @@ HID_STYLIST_NEW,33176, HID_SVXDLG_FILTER_WARNING,34195, HID_SVXPAGE_GRFCROP,34143, HID_SVXPAGE_JSEARCH_OPTIONS,34188, -HID_SVXPAGE_NUM_POSITION,34058, HID_SVXPAGE_PARA_ASIAN,34174, HID_SVXPAGE_PICK_BMP,34055, HID_SVXPAGE_PICK_BULLET,34056, @@ -7855,7 +7854,6 @@ svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_VARIANT_FORM_KANJI,714474603, svx_CheckBox_RID_SVXPAGE_LINE_CBX_SYNCHRONIZE,701547521, svx_CheckBox_RID_SVXPAGE_LINE_CB_SYMBOL_RATIO,701547544, svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905, -svx_CheckBox_RID_SVXPAGE_NUM_POSITION_CB_RELATIVE,704316601, svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK,705594379, svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTODOWNLOAD,705594384, svx_CheckBox_RID_SVXPAGE_OPTIONS_CTL_CB_RESTRICTED,704840716, @@ -8218,9 +8216,6 @@ svx_ListBox_RID_SVXPAGE_LINE_LB_START_STYLE,701550083, svx_ListBox_RID_SVXPAGE_MEASURE_LB_UNIT,703352321, svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS,705498935, svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN,705498948, -svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN,704319027, -svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN_2,704319231, -svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_LABEL_FOLLOWED_BY,704319227, svx_ListBox_RID_SVXPAGE_OPTIONS_CTL_LB_NUMERALS,704843296, svx_ListBox_RID_SVXPAGE_PAGE_LB_LAYOUT,701124116, svx_ListBox_RID_SVXPAGE_PAGE_LB_NUMBER_FORMAT,701124126, @@ -8344,12 +8339,6 @@ svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE2_LEN,703355397, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_DIST,703355395, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_OVERHANG,703355394, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_LINE_DIST,703355393, -svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_ALIGNED_AT,704322305, -svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_BORDERDIST,704322210, -svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_INDENT,704322214, -svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_INDENT_AT,704322307, -svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_LISTTAB,704322301, -svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_NUMDIST,704322212, svx_MetricField_RID_SVXPAGE_PAGE_ED_BOTTOM_MARGIN,701127185, svx_MetricField_RID_SVXPAGE_PAGE_ED_LEFT_MARGIN,701127179, svx_MetricField_RID_SVXPAGE_PAGE_ED_PAPER_HEIGHT,701127224, @@ -8432,7 +8421,6 @@ svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719, svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925, svx_MultiLineEdit_RID_SVX_MDLG_ERR_REP_PREVIEW_ML_ERRPREVIEW_CONTENT,1237813761, svx_MultiListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_LB_ENTRIES,809159812, -svx_MultiListBox_RID_SVXPAGE_NUM_POSITION_LB_LEVEL,704318616, svx_MultiListBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_LBX_FOUND,706677761, svx_NumericField_DLG_INS_ROW_COL_ED_COUNT,1240143874, svx_NumericField_MD_INSERT_OBJECT_IFRAME_NM_MARGINHEIGHT,1598216200, @@ -8636,7 +8624,6 @@ svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_ASSIGN_COMPONENT,705565191, svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_DELETE,705565187, svx_PushButton_RID_SVXPAGE_MENUS_BTN_ADD_COMMANDS,705499974, svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW,705499960, -svx_PushButton_RID_SVXPAGE_NUM_POSITION_PB_STANDARD,704320187, svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHANGEPATH,705597971, svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHECKNOW,705597967, svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692, diff --git a/source/text/shared/01/06050600.xhp b/source/text/shared/01/06050600.xhp index 12000a4..a731051 100644 --- a/source/text/shared/01/06050600.xhp +++ b/source/text/shared/01/06050600.xhp @@ -28,55 +28,57 @@ /meta body section id=position_s -bookmark branch=hid/modules/swriter/ui/outlinepositionpage/OutlinePositionPage xml-lang=en-US id=bm_id3150280/paragraph role=heading id=hd_id3150467 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/06050600.xhp name=PositionPosition/link/paragraph +bookmark branch=hid/modules/swriter/ui/outlinepositionpage/OutlinePositionPage xml-lang=en-US id=bm_id3150280/ +bookmark branch=hid/cui/ui/numberingpositionpage/NumberingPositionPage xml-lang=en-US id=bm_id3150281/ +paragraph role=heading id=hd_id3150467 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/06050600.xhp name=PositionPosition/link/paragraph paragraph role=paragraph id=par_id3158397 xml-lang=en-US l10n=U oldref=2Sets the indent, spacing, and alignment options for the numbered or bulleted list./paragraph /sectioncommentdo we have a how-to for
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 71b78b2b1c76b9a2e0e43c3f5e298b9538fc6282 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 16:54:09 2013 + Updated core Project: help 3dba68c2869157f2011789c2fdf05cb216438ece diff --git a/helpcontent2 b/helpcontent2 index 351c2d4..3dba68c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 351c2d40cc93737f988ba2b35d0ca26d511f296c +Subproject commit 3dba68c2869157f2011789c2fdf05cb216438ece ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/shared/01/06050400.xhp |7 --- 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit 3dba68c2869157f2011789c2fdf05cb216438ece Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 25 16:54:09 2013 + update help ids for numbering graphic page .ui conversion diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 1036342..7b92332 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3890,7 +3890,6 @@ HID_SVXDLG_FILTER_WARNING,34195, HID_SVXPAGE_GRFCROP,34143, HID_SVXPAGE_JSEARCH_OPTIONS,34188, HID_SVXPAGE_PARA_ASIAN,34174, -HID_SVXPAGE_PICK_BMP,34055, HID_SVXPAGE_PICK_BULLET,34056, HID_SVXPAGE_PICK_NUM,34053, HID_SVXPAGE_PICK_SINGLE_NUM,34054, @@ -7864,7 +7863,6 @@ svx_CheckBox_RID_SVXPAGE_PAGE_CB_ADAPT,701121608, svx_CheckBox_RID_SVXPAGE_PAGE_CB_HORZ,701121606, svx_CheckBox_RID_SVXPAGE_PAGE_CB_REGISTER,701121596, svx_CheckBox_RID_SVXPAGE_PAGE_CB_VERT,701121607, -svx_CheckBox_RID_SVXPAGE_PICK_BMP_CB_LINKED,704283872, svx_CheckBox_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE,702137366, svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_AUTO,700810288, svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_REGISTER,700810324, diff --git a/source/text/shared/01/06050400.xhp b/source/text/shared/01/06050400.xhp index e173197..73128a3 100644 --- a/source/text/shared/01/06050400.xhp +++ b/source/text/shared/01/06050400.xhp @@ -28,16 +28,17 @@ /meta body section id=graphics + bookmark xml-lang=en-US branch=hid/cui/ui/pickgraphicpage/PickGraphicPage id=bm_id0611200904382858 localize=false/ paragraph xml-lang=en-US id=hd_id0611200904373284 role=heading level=1 l10n=NEWlink href=text/shared/01/06050400.xhp name=GraphicsGraphics/link/paragraph paragraph xml-lang=en-US id=par_id0611200904373226 role=paragraph l10n=NEWahelp hid=.Displays the different graphics that you can use as bullets in a bulleted list./ahelp/paragraph /section section id=howtoget embed href=text/shared/00/00040500.xhp#graphics/ /section -bookmark xml-lang=en-US branch=hid/CUI_HID_VALUESET_NUMBMP id=bm_id0611200904382857 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/pickgraphicpage/valueset id=bm_id0611200904382857 localize=false/ paragraph xml-lang=en-US id=hd_id0611200904361573 role=heading level=2 l10n=NEWSelection/paragraph paragraph xml-lang=en-US id=par_id061120090436150 role=paragraph l10n=NEWahelp hid=.Click the graphics that you want to use as bullets./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED id=bm_id0611200904355924 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/pickgraphicpage/linkgraphics id=bm_id0611200904355924 localize=false/ paragraph xml-lang=en-US id=hd_id061120090436157 role=heading level=2 l10n=NEWLink graphics/paragraph paragraph xml-lang=en-US id=par_id0611200904361575 role=paragraph l10n=NEWahelp hid=.If enabled, the graphics are inserted as links. If not enabled, the graphics are embedded into the document./ahelp/paragraph section id=relatedtopics @@ -45,4 +46,4 @@ paragraph xml-lang=en-US id=par_id0611200904373391 role=paragraph l10n=NEWlink href=text/shared/01/06050500.xhp name=Options tab (Numbering/Bullets dialog)Options tab (Bullets and Numbering dialog)/link/paragraph /section /body -/helpdocument \ No newline at end of file +/helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source cui/util sw/source
cui/source/inc/helpid.hrc |1 -
cui/util/hidother.src |1 -
sw/source/filter/ww8/ww8par.cxx |6 +++---
sw/source/filter/ww8/ww8par.hxx |2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit e2250ec113e5534875e7480f5bf508d71fa46f4d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 25 16:54:30 2013 +
remove unused hids
Change-Id: Iab2d62506c3985bd3f32e8140057ec136cfd3395
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c1ab0c6..c783861 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -284,7 +284,6 @@
#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_VALUESET_NUMBMP CUI_HID_VALUESET_NUMBMP
#define HID_MEASURE_CTL_PREVIEW CUI_HID_MEASURE_CTL_PREVIEW
#define HID_FORMAT_PARAGRAPH_EXT CUI_HID_FORMAT_PARAGRAPH_EXT
#define HID_FORMAT_PARAGRAPH_ALIGN CUI_HID_FORMAT_PARAGRAPH_ALIGN
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
index 53f1303..a1896da 100644
--- a/cui/util/hidother.src
+++ b/cui/util/hidother.src
@@ -172,7 +172,6 @@ hidspecial HID_TPCOLOR_CMYK_3 { HelpID =
HID_TPCOLOR_CMYK_3; };
hidspecial HID_TPCOLOR_RGB_1{ HelpID = HID_TPCOLOR_RGB_1; };
hidspecial HID_TPCOLOR_RGB_2{ HelpID = HID_TPCOLOR_RGB_2; };
hidspecial HID_TPCOLOR_RGB_3{ HelpID = HID_TPCOLOR_RGB_3; };
-hidspecial HID_VALUESET_NUMBMP { HelpID = HID_VALUESET_NUMBMP
;};
hidspecial HID_WARN_NAME_DUPLICATE { HelpID =
HID_WARN_NAME_DUPLICATE ;};
hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK { HelpId =
UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
hidspecial UID_SEARCH_RECORDSTATUS { HelpID = UID_SEARCH_RECORDSTATUS
;};
commit 963fb917d777f28190d9674e6943ebb5436f435b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 25 16:48:40 2013 +
fix build, change overridden GetOLEStorageName to OUString
Change-Id: I333090ae95218cd3438a8eb8b67ea9f07174ca8f
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index acfecb2..6cabcbd 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -303,7 +303,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
}
SdrObject* pRet = 0;
-String sStorageName;
+OUString sStorageName;
SotStorageRef xSrcStg;
uno::Reference embed::XStorage xDstStg;
if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
@@ -5654,7 +5654,7 @@ sal_Bool WW8Reader::ReadGlossaries(SwTextBlocks rBlocks,
sal_Bool bSaveRelFiles
return bRet ? true : false;
}
-sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String rStorageName,
+sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString rStorageName,
SvStorageRef rSrcStorage, uno::Reference embed::XStorage
rDestStorage) const
{
bool bRet = false;
@@ -5726,7 +5726,7 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId,
String rStorageName,
if( bRet )
{
-rStorageName = '_';
+rStorageName = OUString('_');
rStorageName += rtl::OUString::valueOf(nPictureId);
rSrcStorage = rReader.pStg-OpenSotStorage(rtl::OUString(
SL::aObjectPool));
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 485cc34..8ff035e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -659,7 +659,7 @@ private:
SvStream *pFallbackStream;
std::mapsal_uInt32,rtl::OString aOldEscherBlipCache;
-virtual sal_Bool GetOLEStorageName( long nOLEId, String rStorageName,
+virtual sal_Bool GetOLEStorageName( long nOLEId, OUString rStorageName,
SvStorageRef rSrcStorage, com::sun::star::uno::Reference
com::sun::star::embed::XStorage rDestStorage ) const;
virtual sal_Bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos )
const;
// #i32596# - new parameter _nCalledByGroup, which
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#44582 fixing horizontal scroll bar in sub windows
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1806 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1806 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed aala...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Fix fdo#59616 - ensure BitmapEx has same-sized subbitmaps
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1821
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1821/1
Fix fdo#59616 - ensure BitmapEx has same-sized subbitmaps
Lots of code relies on the fact that the two bitmaps inside a
BitmapEx actually have the same size. Enforce that convention during
import.
Change-Id: I436ccc33b06c627cd6347747d22c24bfaf7ca932
---
M vcl/source/gdi/bitmapex.cxx
1 file changed, 18 insertions(+), 0 deletions(-)
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index e717d0b..f699432 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -806,6 +806,24 @@
if( !!aMask)
{
+// fdo#59616 enforce same size for both mask and content
+if( aMask.GetSizePixel() != aBmp.GetSizePixel() )
+{
+Bitmap aNewMask;
+const Size aNominalSize=aBmp.GetSizePixel();
+BitmapReadAccess aAcc(aMask);
+if( aAcc.HasPalette() )
+aNewMask = Bitmap(aNominalSize,
+ aMask.GetBitCount(),
+ aAcc.GetPalette());
+else
+aNewMask = Bitmap(aNominalSize,
+ aMask.GetBitCount());
+const Rectangle aCopyArea(Point(0,0), aNominalSize);
+aNewMask.CopyPixel(aCopyArea, aCopyArea, aMask);
+aMask = aNewMask;
+}
+
// do we have an alpha mask?
if( ( 8 == aMask.GetBitCount() ) aMask.HasGreyPalette()
)
{
--
To view, visit https://gerrit.libreoffice.org/1821
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I436ccc33b06c627cd6347747d22c24bfaf7ca932
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens tbehr...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Fix fdo#59616 - ensure BitmapEx has same-sized subbitmaps
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1822
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/1822/1
Fix fdo#59616 - ensure BitmapEx has same-sized subbitmaps
Lots of code relies on the fact that the two bitmaps inside a
BitmapEx actually have the same size. Enforce that convention during
import.
Change-Id: I436ccc33b06c627cd6347747d22c24bfaf7ca932
---
M vcl/source/gdi/bitmapex.cxx
1 file changed, 18 insertions(+), 0 deletions(-)
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index d1d4262..133448c 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -904,6 +904,24 @@
if( !!aMask)
{
+// fdo#59616 enforce same size for both mask and content
+if( aMask.GetSizePixel() != aBmp.GetSizePixel() )
+{
+Bitmap aNewMask;
+const Size aNominalSize=aBmp.GetSizePixel();
+BitmapReadAccess aAcc(aMask);
+if( aAcc.HasPalette() )
+aNewMask = Bitmap(aNominalSize,
+ aMask.GetBitCount(),
+ aAcc.GetPalette());
+else
+aNewMask = Bitmap(aNominalSize,
+ aMask.GetBitCount());
+const Rectangle aCopyArea(Point(0,0), aNominalSize);
+aNewMask.CopyPixel(aCopyArea, aCopyArea, aMask);
+aMask = aNewMask;
+}
+
// do we have an alpha mask?
if( ( 8 == aMask.GetBitCount() ) aMask.HasGreyPalette()
)
{
--
To view, visit https://gerrit.libreoffice.org/1822
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I436ccc33b06c627cd6347747d22c24bfaf7ca932
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Thorsten Behrens tbehr...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix for fdo#39632 : Consolidate GetMsiProperty()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1816 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1816 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cd082361126db3d9aced3a878b19e7052514864 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0-0]: Add link to additional sdk-examples
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1819 Approvals: Andras Timar: Verified; Looks good to me, approved Miklos Vajna: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1819 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converted Tools - customize.ui with the submenus widgets.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1823 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/1823/1 Converted Tools - customize.ui with the submenus widgets. Change-Id: I1adfcbb66f4cf919e2e6e9e73dc79ba830a252cf --- A cui/uiconfig/ui/addcommands.ui A cui/uiconfig/ui/addsubmenu.ui A cui/uiconfig/ui/customize.ui A cui/uiconfig/ui/macroselector.ui A cui/uiconfig/ui/movemenu.ui A cui/uiconfig/ui/name.ui A cui/uiconfig/ui/newmenu.ui A cui/uiconfig/ui/renamemenu.ui A cui/uiconfig/ui/renametoolbar.ui 9 files changed, 3,050 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1823 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1adfcbb66f4cf919e2e6e9e73dc79ba830a252cf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#38838 Some removal/replacement of the String/UniString w...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1824 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/1824/1 fdo#38838 Some removal/replacement of the String/UniString with OUString Changed SfxItemPool::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String rText ) const; to use OUString. Change-Id: I656c1d321ff96f1f2e5b77f6adc103ef0a6fdf66 --- M avmedia/inc/avmedia/mediaitem.hxx M avmedia/source/framework/mediaitem.cxx M editeng/inc/editeng/adjitem.hxx M editeng/inc/editeng/akrnitem.hxx M editeng/inc/editeng/blnkitem.hxx M editeng/inc/editeng/bolnitem.hxx M editeng/inc/editeng/boxitem.hxx M editeng/inc/editeng/brkitem.hxx M editeng/inc/editeng/brshitem.hxx M editeng/inc/editeng/bulitem.hxx M editeng/inc/editeng/charhiddenitem.hxx M editeng/inc/editeng/charreliefitem.hxx M editeng/inc/editeng/charrotateitem.hxx M editeng/inc/editeng/charscaleitem.hxx M editeng/inc/editeng/cmapitem.hxx M editeng/inc/editeng/cntritem.hxx M editeng/inc/editeng/colritem.hxx M editeng/inc/editeng/crsditem.hxx M editeng/inc/editeng/cscoitem.hxx M editeng/inc/editeng/emphitem.hxx M editeng/inc/editeng/escpitem.hxx M editeng/inc/editeng/fhgtitem.hxx M editeng/inc/editeng/flstitem.hxx M editeng/inc/editeng/fontitem.hxx M editeng/inc/editeng/forbiddenruleitem.hxx M editeng/inc/editeng/frmdiritem.hxx M editeng/inc/editeng/fwdtitem.hxx M editeng/inc/editeng/hngpnctitem.hxx M editeng/inc/editeng/hyznitem.hxx M editeng/inc/editeng/justifyitem.hxx M editeng/inc/editeng/keepitem.hxx M editeng/inc/editeng/kernitem.hxx M editeng/inc/editeng/langitem.hxx M editeng/inc/editeng/lcolitem.hxx M editeng/inc/editeng/lrspitem.hxx M editeng/inc/editeng/lspcitem.hxx M editeng/inc/editeng/nhypitem.hxx M editeng/inc/editeng/nlbkitem.hxx M editeng/inc/editeng/opaqitem.hxx M editeng/inc/editeng/optitems.hxx M editeng/inc/editeng/orphitem.hxx M editeng/inc/editeng/paravertalignitem.hxx M editeng/inc/editeng/pbinitem.hxx M editeng/inc/editeng/pgrditem.hxx M editeng/inc/editeng/pmdlitem.hxx M editeng/inc/editeng/postitem.hxx M editeng/inc/editeng/prntitem.hxx M editeng/inc/editeng/protitem.hxx M editeng/inc/editeng/prszitem.hxx M editeng/inc/editeng/scriptspaceitem.hxx M editeng/inc/editeng/shaditem.hxx M editeng/inc/editeng/shdditem.hxx M editeng/inc/editeng/sizeitem.hxx M editeng/inc/editeng/spltitem.hxx M editeng/inc/editeng/tstpitem.hxx M editeng/inc/editeng/twolinesitem.hxx M editeng/inc/editeng/udlnitem.hxx M editeng/inc/editeng/ulspitem.hxx M editeng/inc/editeng/wghtitem.hxx M editeng/inc/editeng/widwitem.hxx M editeng/inc/editeng/writingmodeitem.hxx M editeng/inc/editeng/wrlmitem.hxx M editeng/inc/editeng/xmlcnitm.hxx M editeng/source/items/bulitem.cxx M editeng/source/items/charhiddenitem.cxx M editeng/source/items/frmitems.cxx M editeng/source/items/justifyitem.cxx M editeng/source/items/optitems.cxx M editeng/source/items/paraitem.cxx M editeng/source/items/textitem.cxx M editeng/source/items/writingmodeitem.cxx M editeng/source/items/xmlcnitm.cxx M sc/inc/attrib.hxx M sc/inc/docpool.hxx M sc/source/core/data/attrib.cxx M sc/source/core/data/docpool.cxx M sfx2/inc/sfx2/evntconf.hxx M sfx2/inc/sfx2/frmdescr.hxx M sfx2/source/config/evntconf.cxx M sfx2/source/doc/frmdescr.cxx M svl/inc/svl/cenumitm.hxx M svl/inc/svl/cintitem.hxx M svl/inc/svl/ctypeitm.hxx M svl/inc/svl/custritm.hxx M svl/inc/svl/dateitem.hxx M svl/inc/svl/flagitem.hxx M svl/inc/svl/intitem.hxx M svl/inc/svl/itempool.hxx M svl/inc/svl/macitem.hxx M svl/inc/svl/poolitem.hxx M svl/inc/svl/ptitem.hxx M svl/inc/svl/rectitem.hxx M svl/inc/svl/rngitem.hxx M svl/inc/svl/slstitm.hxx M svl/inc/svl/srchitem.hxx M svl/inc/svl/szitem.hxx M svl/inc/svl/visitem.hxx M svl/source/items/cenumitm.cxx M svl/source/items/cintitem.cxx M svl/source/items/ctypeitm.cxx M svl/source/items/custritm.cxx M svl/source/items/dateitem.cxx M svl/source/items/flagitem.cxx M svl/source/items/intitem.cxx M svl/source/items/itempool.cxx M svl/source/items/macitem.cxx M svl/source/items/poolitem.cxx M svl/source/items/ptitem.cxx M svl/source/items/rectitem.cxx M svl/source/items/rngitem_inc.cxx M svl/source/items/sitem.cxx M svl/source/items/slstitm.cxx M svl/source/items/srchitem.cxx M svl/source/items/style.cxx M svl/source/items/szitem.cxx M svl/source/items/visitem.cxx M svl/source/misc/inethist.cxx M svx/inc/svx/algitem.hxx M svx/inc/svx/chrtitem.hxx M svx/inc/svx/drawitem.hxx M svx/inc/svx/grfcrop.hxx M svx/inc/svx/numinf.hxx M svx/inc/svx/optgrid.hxx M svx/inc/svx/pageitem.hxx M svx/inc/svx/postattr.hxx M svx/inc/svx/rotmodit.hxx M svx/inc/svx/rulritem.hxx M svx/inc/svx/sdangitm.hxx M svx/inc/svx/sdasaitm.hxx M svx/inc/svx/sdasitm.hxx M svx/inc/svx/sdgmoitm.hxx M svx/inc/svx/sdmetitm.hxx M svx/inc/svx/sdooitm.hxx M svx/inc/svx/sdprcitm.hxx M svx/inc/svx/sdtaaitm.hxx M svx/inc/svx/sdtaditm.hxx M svx/inc/svx/sdtaitm.hxx M svx/inc/svx/sdtakitm.hxx M svx/inc/svx/sdtayitm.hxx M
[PATCH] fdo#58204: msfilter: do not add ESCHER_Prop_txflTextFlow
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1825
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/1825/1
fdo#58204: msfilter: do not add ESCHER_Prop_txflTextFlow
This breaks PPT export quite badly.
(regression from 24dd42f316e5cb16ba726c05ba486d53e033052d)
Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
---
M filter/source/msfilter/escherex.cxx
1 file changed, 0 insertions(+), 17 deletions(-)
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index cf08b7f..f89825f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -676,23 +676,6 @@
if ( nTextId )
AddOpt( ESCHER_Prop_lTxid, nTextId );
-
-// n#404221: In case of rotation we need to write the txtflTextFlow
-// attribute too.
-if (bIsTextFrame)
-{
-sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue(
-aAny, rXPropSet, OUString( RotateAngle ), sal_True ) ?
-(sal_uInt16)( ( *((sal_Int32*)aAny.getValue() ) ) + 5 ) / 10 :
0;
-if (nAngle==900)
-{
-AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflBtoT );
-}
-if (nAngle==2700)
-{
-AddOpt( ESCHER_Prop_txflTextFlow, ESCHER_txflTtoBA );
-}
-}
}
sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
--
To view, visit https://gerrit.libreoffice.org/1825
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Converted Table- Autofit- Row Height widget
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1765 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1765 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cc578ff3355e720181e68f252d678696ecfeed1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: OSQLParser::RuleIDToRule should not silently change s_aRever...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1826
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/1826/1
OSQLParser::RuleIDToRule should not silently change s_aReverseRuleIDLookup
Change-Id: I2b408a23162b1200bbcd530be7acb42435388b04
---
M connectivity/source/parse/sqlbison.y
M sal/inc/sal/log-areas.dox
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 96d0782..a0f7d43 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4772,7 +4772,18 @@
//-
OSQLParseNode::Rule OSQLParser::RuleIDToRule( sal_uInt32 _nRule )
{
-return s_aReverseRuleIDLookup[ _nRule ];
+OSQLParser::RuleIDMap::const_iterator i
(s_aReverseRuleIDLookup.find(_nRule));
+if (i == s_aReverseRuleIDLookup.end())
+{
+SAL_WARN(connectivity.parse,
+connectivity::OSQLParser::RuleIDToRule cannot reverse-lookup
rule.
+Reverse mapping incomplete?
+_nRule=' _nRule '
+yytname[_nRule]=' yytname[_nRule] ');
+return OSQLParseNode::UNKNOWN_RULE;
+}
+else
+return i-second;
}
//-
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index c167267..b5fa6f9 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -37,6 +37,7 @@
@section connectivity
@li @c connectivity.mork
+@li @c connectivity.parse
@section cui
--
To view, visit https://gerrit.libreoffice.org/1826
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b408a23162b1200bbcd530be7acb42435388b04
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fix handling of subqueries in query design
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1827
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/1827/1
fix handling of subqueries in query design
- don't remove parentheses around subqueries
(without the parentheses, it is not valid SQL)
* when saving a Field (name value) typed by the user interactively
* when parsing SQL and constructing the initial Query Design view
- automatically add the necessary parentheses
when a SELECT statement is entered as column name
Also:
In code saving a Field (name value) typed by the user interactively,
factorise some common code
Assorted minor fixes (typos in comments, etc)
Change-Id: I3843258323c903cba23238b0730ec4eb5875f792
---
M dbaccess/source/ui/querydesign/QueryDesignView.cxx
M dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
M dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
3 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 3c386db..8264152 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2198,7 +2198,8 @@
pColumnRef = pColumnRef-getChild(0);
OTableFieldDescRef aInfo = new OTableFieldDesc();
-if (pColumnRef-count() == 3
+if (pColumnRef-getKnownRuleID() !=
OSQLParseNode::subquery
+pColumnRef-count() == 3
SQL_ISPUNCTUATION(pColumnRef-getChild(0),()
SQL_ISPUNCTUATION(pColumnRef-getChild(2),))
)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 5544549..e85cb29 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -649,7 +649,7 @@
return bError;
}
//
-
-sal_Bool OSelectionBrowseBox::saveField(const String
_sFieldName,OTableFieldDescRef _pEntry,sal_Bool _bListAction)
+sal_Bool OSelectionBrowseBox::saveField(String _sFieldName
,OTableFieldDescRef _pEntry, sal_Bool _bListAction)
{
sal_Bool bError = sal_False;
@@ -680,50 +680,63 @@
// we have to look which entries we should quote
const ::rtl::OUString sFieldAlias = _pEntry-GetFieldAlias();
-size_t nPass = 4;
::connectivity::OSQLParser rParser( rController.getParser() );
-OSQLParseNode* pParseNode = NULL;
-// 4 passes in trying to interprete the field name
-// - don't quote the field name, parse internationally
-// - don't quote the field name, parse en-US
-// - quote the field name, parse internationally
-// - quote the field name, parse en-US
-do
{
-bool bQuote = ( nPass = 2 );
-bool bInternational = ( nPass % 2 ) == 0;
+// automatically add parentheses around subqueries
+OSQLParseNode *pParseNode = NULL;
+OUString devnull;
+pParseNode = rParser.parseTree( devnull, _sFieldName, true );
+if (pParseNode == NULL)
+pParseNode = rParser.parseTree( devnull, _sFieldName, false );
+if (pParseNode != NULL SQL_ISRULE(pParseNode, select_statement))
+_sFieldName = ::rtl::OUString(() + _sFieldName + );
+}
-::rtl::OUString sSql;
-if ( bQuote )
-sSql += ::dbtools::quoteName(
xMetaData-getIdentifierQuoteString(), _sFieldName );
-else
-sSql += _sFieldName;
+OSQLParseNode* pParseNode = NULL;
+{
+// 4 passes in trying to interprete the field name
+// - don't quote the field name, parse internationally
+// - don't quote the field name, parse en-US
+// - quote the field name, parse internationally
+// - quote the field name, parse en-US
+size_t nPass = 4;
+::rtl::OUString sQuotedFullFieldName(::dbtools::quoteName(
xMetaData-getIdentifierQuoteString(), _sFieldName ));
+::rtl::OUString sFullFieldName(_sFieldName);
if ( _pEntry-isAggreateFunction() )
{
OSL_ENSURE(!_pEntry-GetFunction().isEmpty(),Functionname darf
hier nicht leer sein! ;-();
-::rtl::OUStringBuffer aTmpStr2( _pEntry-GetFunction());
-aTmpStr2.appendAscii(();
-aTmpStr2.append(sSql);
-aTmpStr2.appendAscii());
-sSql = aTmpStr2.makeStringAndClear();
+sQuotedFullFieldName = _pEntry-GetFunction() + ( +
sQuotedFullFieldName + );
+sFullFieldName = _pEntry-GetFunction() + ( + sFullFieldName +
);
}
-sSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SELECT )) + sSql;
-if ( !sFieldAlias.isEmpty() )
-{ // always
[PATCH] Change in core[libreoffice-4-0]: don't use ScDrawLayer::GetObjDataTab to get Anchor fix for f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1828
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/1828/1
don't use ScDrawLayer::GetObjDataTab to get Anchor fix for fdo#59325
Seems ScDrawLayer::GetObjDataTab was used mistakenly thinking that only an
anchor
for that tab would be returned ( but actually whatever anchor is returned gets
the
tab set )
Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7
---
M sc/source/ui/view/drawview.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 2c13e34..6900932 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -765,7 +765,7 @@
ScSplitPos eWhich = pViewData-GetActivePart();
ScGridWindow* pGridWin = (ScGridWindow*)pViewData-GetActiveWin();
-ScDrawObjData* pData = ScDrawLayer::GetObjDataTab( pObj, nTab );
+ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj );
if ( pGridWin )
{
ScAddress aOldStt;
--
To view, visit https://gerrit.libreoffice.org/1828
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59728: Fix encoding of .py files as UTF-8 for Python 3
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1829 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/1829/1 fdo#59728: Fix encoding of .py files as UTF-8 for Python 3 ...where it could default to something like CP 1252 instead on Windows, while keeping backwards compatibility for now with running under Python 2 (where things apparently worked well with the original code). Change-Id: I0ddd06771a36e1cd2cc2ce78abd8bd667db7778f (cherry picked from commit c2445b03f4d27bbd7e14c4322704ce89b582839b) --- M pyuno/source/loader/pythonloader.py 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index 0330a6e..de4d630 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -90,7 +90,10 @@ # read the file filename = unohelper.fileUrlToSystemPath( url ) -fileHandle = open( filename ) +if sys.version = '3': +fileHandle = open( filename, encoding='utf_8' ) +else: +fileHandle = open( filename ) src = fileHandle.read().replace(\r,) if not src.endswith( \n ): src = src + \n -- To view, visit https://gerrit.libreoffice.org/1829 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ddd06771a36e1cd2cc2ce78abd8bd667db7778f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#59728: Fix encoding of .py files as UTF-8 for Python 3
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1829 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1829 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ddd06771a36e1cd2cc2ce78abd8bd667db7778f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59428: SwDoc::ChgPageDesc: always copy to first-pagedesc
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1830
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/1830/1
fdo#59428: SwDoc::ChgPageDesc: always copy to first-pagedesc
... otherwise the first page will not be updated on page style changes.
(uncovered by commit c41675a7d13dac64540ad420f905e80dbcbc023d,
which should have fixed this too)
Change-Id: I04f75b2a8e8929767fb36dd7085c3a273f07c93a
(cherry picked from commit da1398c503784086ecd0a10dd8e809069d649653)
---
M sw/source/core/doc/docdesc.cxx
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 37b6566..1852b4c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -296,12 +296,12 @@
((SwPageDesc)rChged).Mirror();
else
{
-// Or else transfer values from Master to Left and First.
-::lcl_DescSetAttr( ((SwPageDesc)rChged).GetMaster(),
- ((SwPageDesc)rChged).GetLeft() );
-::lcl_DescSetAttr( ((SwPageDesc)rChged).GetMaster(),
- ((SwPageDesc)rChged).GetFirst() );
+// Or else transfer values from Master to Left
+::lcl_DescSetAttr(rChged.GetMaster(),
+ const_castSwPageDesc(rChged).GetLeft());
}
+::lcl_DescSetAttr(rChged.GetMaster(),
+ const_castSwPageDesc(rChged).GetFirst());
// Take over NumType.
if( rChged.GetNumType().GetNumberingType() !=
pDesc-GetNumType().GetNumberingType() )
--
To view, visit https://gerrit.libreoffice.org/1830
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04f75b2a8e8929767fb36dd7085c3a273f07c93a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: reset automatic row height flag after import, fdo#59193
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1831 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/1831/1 reset automatic row height flag after import, fdo#59193 Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b --- M sc/source/ui/docshell/docsh.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 948f622..43fd526 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -469,11 +469,14 @@ // still need to recalc volatile formula cells. aDocument.CalcFormulaTree(false, true, false); +bool bAdjustHeightOld = aDocument.IsAdjustHeightEnabled(); aDocument.EnableAdjustHeight(false); aDocument.SetXMLFromWrapper( false ); AfterXMLLoading(bRet); +aDocument.EnableAdjustHeight(bAdjustHeightOld); + return bRet; } -- To view, visit https://gerrit.libreoffice.org/1831 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: reset automatic row height flag after import, fdo#59193
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1832 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/1832/1 reset automatic row height flag after import, fdo#59193 Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b --- M sc/source/ui/docshell/docsh.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 948f622..43fd526 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -469,11 +469,14 @@ // still need to recalc volatile formula cells. aDocument.CalcFormulaTree(false, true, false); +bool bAdjustHeightOld = aDocument.IsAdjustHeightEnabled(); aDocument.EnableAdjustHeight(false); aDocument.SetXMLFromWrapper( false ); AfterXMLLoading(bRet); +aDocument.EnableAdjustHeight(bAdjustHeightOld); + return bRet; } -- To view, visit https://gerrit.libreoffice.org/1832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] OUString: remove namespace and chained appends
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1833
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/1833/1
OUString: remove namespace and chained appends
Change-Id: I1eb7e61f3151c0469db26c69439e16be0f7063df
---
M sw/inc/hhcwrp.hxx
M sw/source/ui/lingu/hhcwrp.cxx
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 18fcd65..be20aa2 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -66,7 +66,7 @@
voidSelectNewUnit_impl( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
voidChangeText( const String rNewText,
-const ::rtl::OUString rOrigText,
+const OUString rOrigText,
const ::com::sun::star::uno::Sequence sal_Int32
*pOffsets,
SwPaM *pCrsr );
voidChangeText_impl( const String rNewText, sal_Bool
bKeepAttributes );
@@ -75,15 +75,15 @@
inline void SetDrawObj( sal_Bool bNew ) { m_bIsDrawObj = bNew; }
protected:
-virtual voidGetNextPortion( ::rtl::OUString rNextPortion,
+virtual voidGetNextPortion( OUString rNextPortion,
LanguageType rLangOfPortion,
sal_Bool
bAllowImplicitChangesForNotConvertibleText );
virtual voidHandleNewUnit( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
virtual voidReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
-const ::rtl::OUString rOrigText,
-const ::rtl::OUString rReplaceWith,
+const OUString rOrigText,
+const OUString rReplaceWith,
const ::com::sun::star::uno::Sequence sal_Int32
rOffsets,
ReplacementAction eAction,
LanguageType *pNewUnitLanguage );
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 260afda..fb0615c 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -49,7 +49,6 @@
#include unomid.h
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
@@ -169,7 +168,7 @@
void SwHHCWrapper::GetNextPortion(
-::rtl::OUStringrNextPortion,
+OUString rNextPortion,
LanguageType rLangOfPortion,
sal_Bool bAllowChanges )
{
@@ -380,15 +379,12 @@
void SwHHCWrapper::ReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
- const ::rtl::OUString rOrigText,
+ const OUString rOrigText,
const OUString rReplaceWith,
const uno::Sequence sal_Int32 rOffsets,
ReplacementAction eAction,
LanguageType *pNewUnitLanguage )
{
-static OUString aBracketedStart( ( );
-static OUString aBracketedEnd( ) );
-
OSL_ENSURE( nUnitStart = 0 nUnitEnd = nUnitStart, wrong arguments );
if (!(nUnitStart = 0 nUnitEnd = nUnitStart))
return;
@@ -413,12 +409,12 @@
break;
case eReplacementBracketed :
{
-(((aNewTxt = aOrigTxt) += aBracketedStart) += rReplaceWith) +=
aBracketedEnd;
+aNewTxt = aOrigTxt + ( + rReplaceWith + );
}
break;
case eOriginalBracketed :
{
-(((aNewTxt = rReplaceWith) += aBracketedStart) += aOrigTxt) +=
aBracketedEnd;
+aNewTxt = rReplaceWith + ( + aOrigTxt + );
}
break;
case eReplacementAbove :
--
To view, visit https://gerrit.libreoffice.org/1833
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb7e61f3151c0469db26c69439e16be0f7063df
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: don't use ScDrawLayer::GetObjDataTab to get Anchor fix for f...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1828 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1828 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#58562: Ensure internal data is always used when pasting ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1835
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/1835/1
fdo#58562: Ensure internal data is always used when pasting to another doc.
Without this, pasting a chart object from one Calc doc to another may
occasionally incorrectly switch to range references *if* the destination
document contains the right set of sheet names. With this fix, pasted
chart objects always switch to internal cached data source when pasting
to another document, while retaining range references when pasting within
the same document.
Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
---
M sc/inc/unonames.hxx
M sc/source/ui/unoobj/chart2uno.cxx
M xmloff/source/chart/SchXMLTools.cxx
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index ca89837..9ab1856 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -652,6 +652,7 @@
#define SC_UNONAME_HIDDENVALUES HiddenValues
#define SC_UNONAME_INCLUDEHIDDENCELLS IncludeHiddenCells
#define SC_UNONAME_HIDDENVALUES HiddenValues
+#define SC_UNONAME_USE_INTERNAL_DATA_PROVIDER UseInternalDataProvider
// Solver
#define SC_UNONAME_TIMEOUT Timeout
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53656cb..5ea6f54 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -76,7 +76,8 @@
{
static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
{
-{MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_USE_INTERNAL_DATA_PROVIDER), 0,
getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aDataProviderPropertyMap_Impl;
@@ -2327,6 +2328,11 @@
uno::Any aRet;
if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
aRet = m_bIncludeHiddenCells;
+else if (rPropertyName == SC_UNONAME_USE_INTERNAL_DATA_PROVIDER)
+{
+// This is a read-only property.
+aRet = static_castsal_Bool(m_pDocument-PastingDrawFromOtherDoc());
+}
else
throw beans::UnknownPropertyException();
return aRet;
diff --git a/xmloff/source/chart/SchXMLTools.cxx
b/xmloff/source/chart/SchXMLTools.cxx
index 2c83c3e..e12de82 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -380,14 +380,34 @@
return xRet;
}
-try
+bool bUseInternal = false;
+uno::Referencebeans::XPropertySet xPropSet(xDataProvider,
uno::UNO_QUERY);
+if (xPropSet.is())
{
-xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
-SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+try
+{
+sal_Bool bVal;
+uno::Any any =
xPropSet-getPropertyValue(UseInternalDataProvider);
+if (any = bVal)
+bUseInternal = static_castbool(bVal);
+}
+catch (const beans::UnknownPropertyException)
+{
+// Do nothing
+}
}
-catch( const lang::IllegalArgumentException )
+
+if (!bUseInternal)
{
-OSL_FAIL( could not create data sequence );
+try
+{
+xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
+SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+}
+catch( const lang::IllegalArgumentException )
+{
+OSL_FAIL( could not create data sequence );
+}
}
if( !xRet.is() !xChartDoc-hasInternalDataProvider()
!rRange.isEmpty() )
--
To view, visit https://gerrit.libreoffice.org/1835
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Resolves the bug fdo#59117 missing borders of last column
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1834
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/1834/1
Resolves the bug fdo#59117 missing borders of last column
When writingmode is set to RTL, the table is start drawn from Last column
to first column. There is no problem with leftright lines, Because these
are not depends on the LTR or RTL writingmode. But the bottom top line
depends on writing mode. As these two lines are drawn from previous cell to
next cell(left to right) the nX value should be nX-1 in RTL writingmode.
Change-Id: I3e21c7dd469ed5ba29e66f79da471b662632182e
---
M svx/source/table/viewcontactoftableobj.cxx
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/svx/source/table/viewcontactoftableobj.cxx
b/svx/source/table/viewcontactoftableobj.cxx
index a74dc60..1f9f7d2 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -357,7 +357,7 @@
}
}
-if(!getRightLine().isEmpty() getRightIsOutside())
+if(!getRightLine().isEmpty())
{
// create right line from top to bottom
const basegfx::B2DPoint aStart(getTransform() *
basegfx::B2DPoint(1.0, 0.0));
@@ -622,9 +622,11 @@
// get basic lines
impGetLine(aLeftLine, rTableLayouter, nX,
nY, false, nColCount, nRowCount, bIsRTL);
-impGetLine(aBottomLine, rTableLayouter,
nX, nYBottom, true, nColCount, nRowCount, bIsRTL);
+//To resolve the bug fdo#59117
+//In RTL table as BottomLine TopLine are
drawn from Left Side to Right, nX should be nX-1
+impGetLine(aBottomLine, rTableLayouter,
bIsRTL?nX-1:nX, nYBottom, true, nColCount, nRowCount, bIsRTL);
impGetLine(aRightLine, rTableLayouter,
nXRight, nY, false, nColCount, nRowCount, bIsRTL);
-impGetLine(aTopLine, rTableLayouter, nX,
nY, true, nColCount, nRowCount, bIsRTL);
+impGetLine(aTopLine, rTableLayouter,
bIsRTL?nX-1:nX, nY, true, nColCount, nRowCount, bIsRTL);
// get the neighbor cells' borders
impGetLine(aLeftFromTLine, rTableLayouter,
nX, nY - 1, false, nColCount, nRowCount, bIsRTL);
--
To view, visit https://gerrit.libreoffice.org/1834
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e21c7dd469ed5ba29e66f79da471b662632182e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Karthikeyan Krishnamurthi karthike...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: fdo#59728: Fix encoding of .py files as UTF-8 for Python 3
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1836 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/1836/1 fdo#59728: Fix encoding of .py files as UTF-8 for Python 3 ...where it could default to something like CP 1252 instead on Windows, while keeping backwards compatibility for now with running under Python 2 (where things apparently worked well with the original code). Change-Id: I0ddd06771a36e1cd2cc2ce78abd8bd667db7778f (cherry picked from commit c2445b03f4d27bbd7e14c4322704ce89b582839b) Reviewed-on: https://gerrit.libreoffice.org/1829 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com (cherry picked from commit 85e7a0f6cd9b311e6734e747b03ad0a736ff6dbd) --- M pyuno/source/loader/pythonloader.py 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index 0330a6e..de4d630 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -90,7 +90,10 @@ # read the file filename = unohelper.fileUrlToSystemPath( url ) -fileHandle = open( filename ) +if sys.version = '3': +fileHandle = open( filename, encoding='utf_8' ) +else: +fileHandle = open( filename ) src = fileHandle.read().replace(\r,) if not src.endswith( \n ): src = src + \n -- To view, visit https://gerrit.libreoffice.org/1836 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ddd06771a36e1cd2cc2ce78abd8bd667db7778f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#59428: SwDoc::ChgPageDesc: always copy to first-pagedesc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1830 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1830 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04f75b2a8e8929767fb36dd7085c3a273f07c93a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: don't use ScDrawLayer::GetObjDataTab to get Anchor fix for f...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1837
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/1837/1
don't use ScDrawLayer::GetObjDataTab to get Anchor fix for fdo#59325
Seems ScDrawLayer::GetObjDataTab was used mistakenly thinking that only an
anchor
for that tab would be returned ( but actually whatever anchor is returned gets
the
tab set )
Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7
Reviewed-on: https://gerrit.libreoffice.org/1828
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
---
M sc/source/ui/view/drawview.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 2c13e34..6900932 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -765,7 +765,7 @@
ScSplitPos eWhich = pViewData-GetActivePart();
ScGridWindow* pGridWin = (ScGridWindow*)pViewData-GetActiveWin();
-ScDrawObjData* pData = ScDrawLayer::GetObjDataTab( pObj, nTab );
+ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj );
if ( pGridWin )
{
ScAddress aOldStt;
--
To view, visit https://gerrit.libreoffice.org/1837
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: minor librelogo fix: remove ro lang. guess. (fix en_US detec...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1838
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/1838/1
minor librelogo fix: remove ro lang. guess. (fix en_US detection)
Change-Id: I6fbd5cef4f5935f7932bd9b64774315baee0e50d
---
M librelogo/source/LibreLogo/LibreLogo.py
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index 556837d..13d7a2a 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -25,7 +25,7 @@
__lngpath__ =
unohelper.fileUrlToSystemPath(re.sub(program/(fundamental.ini|fundamentalrc)$,
, urebootstrap))
__lngpath__ = __lngpath__ + share/Scripts/python/LibreLogo/.replace(/,
os.sep)
-__translang__ =
am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ro|ru|se|sl # FIXME
supported languages for language guessing, expand this list, according to the
localizations
+__translang__ =
am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ru|se|sl # FIXME
supported languages for language guessing, expand this list, according to the
localizations
__lng__ = {}
__docs__ = {}
__prevcode__ = None
--
To view, visit https://gerrit.libreoffice.org/1838
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fbd5cef4f5935f7932bd9b64774315baee0e50d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Németh László nem...@numbertext.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#56098 Paste Special options after cut incorrect
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1671 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1671 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf6aa698e69a2271cf68f420ceaec4aaffe94ad0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#59101 - [Feature Request] Make Find hotkey (Ctrl+F) a to...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1751 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1751 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8cf518a18e4846f9e687d05c7f7c0eb774abba6f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: reset automatic row height flag after import, fdo#59193
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1831 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1831 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#58562: Ensure internal data is always used when pasting ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1835 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1835 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#46718 Delete multiple styles at once
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1737 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1737 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f5982b2a2768d021f24693a285274544e07e40f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Replace the frequent functioncalls
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1777 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1777 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e1460913099d1060d5005329e0b63e5ebcd362c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Karthikeyan Krishnamurthi karthike...@kacst.edu.sa Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] sc test XSheetOutline
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1794 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1794 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea0576e61963dbdb72c88fe332c7cfe3e8ab7ff0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Laurent Godard lgodard.li...@laposte.net Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: Fix fdo#59616 - ensure BitmapEx has same-sized subbitmaps
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1822 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1822 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I436ccc33b06c627cd6347747d22c24bfaf7ca932 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#59586 Missing comma in particular PDF file
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1839
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/1839/1
Resolves: fdo#59586 Missing comma in particular PDF file
regression from d9e4c74811855de15f1bf2045c2c9b061a2d4dc6
- if ( LANGUAGE_KOREAN != aLang LANGUAGE_KOREAN_JOHAB != aLang )
+ if (MsLangId::isKorean(aLang))
should obviously have been
- if ( LANGUAGE_KOREAN != aLang LANGUAGE_KOREAN_JOHAB != aLang )
+ if (!MsLangId::isKorean(aLang))
Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81
(cherry picked from commit e029e7394b972fd72930c8c475f3768dd99fe673)
---
M sw/source/core/text/portxt.cxx
M sw/source/core/txtnode/fntcache.cxx
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 7842c11..293d348 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -94,7 +94,7 @@
LanguageType aLang =
rInf.GetTxtFrm()-GetTxtNode()-GetLang( rInf.GetIdx(), 1, nScript
);
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
const SwLinePortion* pPor = rPor.GetPortion();
if ( pPor ( pPor-IsKernPortion() ||
@@ -202,7 +202,7 @@
LanguageType aLang =
rInf.GetTxtFrm()-GetTxtNode()-GetLang( nPos, 1, nNextScript
);
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
++nCnt;
}
}
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 10bb745..3609b8b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1085,7 +1085,7 @@
if ( ( SW_CJK == nActual || SW_LATIN == nActual )
nSpaceAdd )
{
LanguageType aLang = rInf.GetFont()-GetLanguage(
SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -1261,7 +1261,7 @@
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -1472,7 +1472,7 @@
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -2042,7 +2042,7 @@
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
--
To view, visit https://gerrit.libreoffice.org/1839
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59798: MSI installer spurious space in version number
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1840
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/1840/1
fdo#59798: MSI installer spurious space in version number
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01
(cherry picked from commit 3c0f360995741c16e93f49b1a1e771d0f4e40dc7)
---
M solenv/bin/modules/installer/windows/property.pm
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 56f4ba5d..fddb6c4 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -167,7 +167,7 @@
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
$productextension = $allvariables-{'PRODUCTEXTENSION'};
-$productname = $productname . . $productextension;
+$productname = $productname . $productextension;
}
if ( $installer::globals::languagepack )
--
To view, visit https://gerrit.libreoffice.org/1840
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1841
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1841/1
fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
... by adding POSTVERSIONEXTENSION after PRODUCTEXTENSION.
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
(cherry picked from commit e2d60ae0bf885a39bb392729797b0fc6ec3a5fe5)
---
M solenv/bin/modules/installer/windows/property.pm
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index fddb6c4..20e6ad3 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -156,13 +156,6 @@
my $version = $allvariables-{'PRODUCTVERSION'};
my $productname = $name . . $version;
-my $postversionextension = ;
-if ( $allvariables-{'POSTVERSIONEXTENSION'} )
-{
-$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
-$productname = $productname . . $postversionextension;
-}
-
my $productextension = ;
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
@@ -170,6 +163,13 @@
$productname = $productname . $productextension;
}
+my $postversionextension = ;
+if ( $allvariables-{'POSTVERSIONEXTENSION'} )
+{
+$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
+$productname = $productname . . $postversionextension;
+}
+
if ( $installer::globals::languagepack )
{
my $langstring = get_english_language_string(); # Example: (English,
German)
--
To view, visit https://gerrit.libreoffice.org/1841
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#59798: MSI installer spurious space in version number
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1840 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1840 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1841 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1841 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1844
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1844/1
fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
... by adding POSTVERSIONEXTENSION after PRODUCTEXTENSION.
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
(cherry picked from commit e2d60ae0bf885a39bb392729797b0fc6ec3a5fe5)
Reviewed-on: https://gerrit.libreoffice.org/1841
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
(cherry picked from commit c6a1ebfd96e0d05bd6b93d49dd3fdebc518c9328)
---
M solenv/bin/modules/installer/windows/property.pm
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index fddb6c4..20e6ad3 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -156,13 +156,6 @@
my $version = $allvariables-{'PRODUCTVERSION'};
my $productname = $name . . $version;
-my $postversionextension = ;
-if ( $allvariables-{'POSTVERSIONEXTENSION'} )
-{
-$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
-$productname = $productname . . $postversionextension;
-}
-
my $productextension = ;
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
@@ -170,6 +163,13 @@
$productname = $productname . $productextension;
}
+my $postversionextension = ;
+if ( $allvariables-{'POSTVERSIONEXTENSION'} )
+{
+$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
+$productname = $productname . . $postversionextension;
+}
+
if ( $installer::globals::languagepack )
{
my $langstring = get_english_language_string(); # Example: (English,
German)
--
To view, visit https://gerrit.libreoffice.org/1844
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: Resolves: fdo#59586 Missing comma in particular PDF file
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1845
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1845/1
Resolves: fdo#59586 Missing comma in particular PDF file
regression from d9e4c74811855de15f1bf2045c2c9b061a2d4dc6
- if ( LANGUAGE_KOREAN != aLang LANGUAGE_KOREAN_JOHAB != aLang )
+ if (MsLangId::isKorean(aLang))
should obviously have been
- if ( LANGUAGE_KOREAN != aLang LANGUAGE_KOREAN_JOHAB != aLang )
+ if (!MsLangId::isKorean(aLang))
Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81
(cherry picked from commit e029e7394b972fd72930c8c475f3768dd99fe673)
Reviewed-on: https://gerrit.libreoffice.org/1839
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit f3a0e72261419554d0cd3984a0e8f800ed587d49)
---
M sw/source/core/text/portxt.cxx
M sw/source/core/txtnode/fntcache.cxx
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 7842c11..293d348 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -94,7 +94,7 @@
LanguageType aLang =
rInf.GetTxtFrm()-GetTxtNode()-GetLang( rInf.GetIdx(), 1, nScript
);
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
const SwLinePortion* pPor = rPor.GetPortion();
if ( pPor ( pPor-IsKernPortion() ||
@@ -202,7 +202,7 @@
LanguageType aLang =
rInf.GetTxtFrm()-GetTxtNode()-GetLang( nPos, 1, nNextScript
);
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
++nCnt;
}
}
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 10bb745..3609b8b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1085,7 +1085,7 @@
if ( ( SW_CJK == nActual || SW_LATIN == nActual )
nSpaceAdd )
{
LanguageType aLang = rInf.GetFont()-GetLanguage(
SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -1261,7 +1261,7 @@
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -1472,7 +1472,7 @@
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
@@ -2042,7 +2042,7 @@
{
LanguageType aLang = rInf.GetFont()-GetLanguage( SW_CJK );
-if (MsLangId::isKorean(aLang))
+if (!MsLangId::isKorean(aLang))
{
long nSpaceSum = nSpaceAdd;
for ( sal_uInt16 nI = 0; nI rInf.GetLen(); ++nI )
--
To view, visit https://gerrit.libreoffice.org/1845
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Added Few more sub widgets under options-LibreOffice
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1786 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1786 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcf1d5e4c02b72fecc3d91ac85f96d5683bae6c3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Added Options.ui Widget and few sub widgets under Option-Li...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1750 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1750 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6ad009b79ef35e91b329ee7f3c534a17d856b59 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0-0]: reset automatic row height flag after import, fdo#59193
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1832 Approvals: Kohei Yoshida: Verified; Looks good to me, approved Noel Power: Verified; Looks good to me, but someone else must approve Joren De Cuyper: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: fdo#58562: Ensure internal data is always used when pasting ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1846
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1846/1
fdo#58562: Ensure internal data is always used when pasting to another doc.
Without this, pasting a chart object from one Calc doc to another may
occasionally incorrectly switch to range references *if* the destination
document contains the right set of sheet names. With this fix, pasted
chart objects always switch to internal cached data source when pasting
to another document, while retaining range references when pasting within
the same document.
Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Reviewed-on: https://gerrit.libreoffice.org/1835
Tested-by: Noel Power noel.po...@suse.com
Reviewed-by: Noel Power noel.po...@suse.com
---
M sc/inc/unonames.hxx
M sc/source/ui/unoobj/chart2uno.cxx
M xmloff/source/chart/SchXMLTools.cxx
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index ca89837..9ab1856 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -652,6 +652,7 @@
#define SC_UNONAME_HIDDENVALUES HiddenValues
#define SC_UNONAME_INCLUDEHIDDENCELLS IncludeHiddenCells
#define SC_UNONAME_HIDDENVALUES HiddenValues
+#define SC_UNONAME_USE_INTERNAL_DATA_PROVIDER UseInternalDataProvider
// Solver
#define SC_UNONAME_TIMEOUT Timeout
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53656cb..5ea6f54 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -76,7 +76,8 @@
{
static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
{
-{MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_USE_INTERNAL_DATA_PROVIDER), 0,
getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aDataProviderPropertyMap_Impl;
@@ -2327,6 +2328,11 @@
uno::Any aRet;
if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
aRet = m_bIncludeHiddenCells;
+else if (rPropertyName == SC_UNONAME_USE_INTERNAL_DATA_PROVIDER)
+{
+// This is a read-only property.
+aRet = static_castsal_Bool(m_pDocument-PastingDrawFromOtherDoc());
+}
else
throw beans::UnknownPropertyException();
return aRet;
diff --git a/xmloff/source/chart/SchXMLTools.cxx
b/xmloff/source/chart/SchXMLTools.cxx
index 2c83c3e..e12de82 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -380,14 +380,34 @@
return xRet;
}
-try
+bool bUseInternal = false;
+uno::Referencebeans::XPropertySet xPropSet(xDataProvider,
uno::UNO_QUERY);
+if (xPropSet.is())
{
-xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
-SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+try
+{
+sal_Bool bVal;
+uno::Any any =
xPropSet-getPropertyValue(UseInternalDataProvider);
+if (any = bVal)
+bUseInternal = static_castbool(bVal);
+}
+catch (const beans::UnknownPropertyException)
+{
+// Do nothing
+}
}
-catch( const lang::IllegalArgumentException )
+
+if (!bUseInternal)
{
-OSL_FAIL( could not create data sequence );
+try
+{
+xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
+SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+}
+catch( const lang::IllegalArgumentException )
+{
+OSL_FAIL( could not create data sequence );
+}
}
if( !xRet.is() !xChartDoc-hasInternalDataProvider()
!rRange.isEmpty() )
--
To view, visit https://gerrit.libreoffice.org/1846
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1788 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1788 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Translate German comments, fix some ws
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1817 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1817 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I962077a8c7d533c7eaf6d5ba68ec18966e5760a1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Weissenbacher p.weissenbac...@gmail.com Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: Template Manager: remote repositories only for experimental ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1847
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1847/1
Template Manager: remote repositories only for experimental mode
Change-Id: I79501bdcd25f362065d9b95efd1a43f6be84577e
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f1e69f5..833e556 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -30,6 +30,7 @@
#include sfx2/thumbnailviewitem.hxx
#include sot/storage.hxx
#include svtools/imagemgr.hxx
+#include svtools/miscopt.hxx
#include svtools/PlaceEditDialog.hxx
#include tools/urlobj.hxx
#include unotools/moduleoptions.hxx
@@ -177,6 +178,13 @@
maTabControl.SetActivatePageHdl(LINK(this,SfxTemplateManagerDlg,ActivatePageHdl));
+SvtMiscOptions aMiscOptions;
+if ( !aMiscOptions.IsExperimentalMode() )
+{
+sal_uInt16 nPos = mpViewBar-GetItemId(TBI_TEMPLATE_REPOSITORY);
+mpViewBar-RemoveItem(nPos);
+}
+
mpViewBar-Show();
mpActionBar-Show();
--
To view, visit https://gerrit.libreoffice.org/1847
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79501bdcd25f362065d9b95efd1a43f6be84577e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
resolves:fdo#54629 vcl:gdi add recursive check
navin patidar has abandoned this change. Change subject: resolves:fdo#54629 vcl:gdi add recursive check .. Patch Set 3: Abandoned I agree using MultiSalLayout::GetNextGlyphs is right way to fix this bug . I didn't remove MultiSalLayout::GetBoundRect because i thought removing it might break something else. Thanks for reviewing patch -- To view, visit https://gerrit.libreoffice.org/1662 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I8eebde2196d6551ddcf9d020afa3a157c809710c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] String cleanup in filter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1848
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1848/1
String cleanup in filter
Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
---
M filter/inc/filter/msfilter/svxmsbas.hxx
M filter/source/msfilter/svxmsbas2.cxx
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx
b/filter/inc/filter/msfilter/svxmsbas.hxx
index 66df15e..8f87401 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -44,9 +44,9 @@
* probably what the user expects to see when viewing the code
*/
-typedef boost::unordered_map sal_Int32, String ObjIdToName;
+typedef boost::unordered_map sal_Int32, OUString ObjIdToName;
-typedef std::map String, ObjIdToName ControlAttributeInfo;
+typedef std::map OUString, ObjIdToName ControlAttributeInfo;
class MSFILTER_DLLPUBLIC SvxImportMSVBasic
{
@@ -58,13 +58,13 @@
// form the ObjectShell
// - returns a warning code if a modified basic exist, in all other
// cases return ERRCODE_NONE.
-sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const String
rStorageName );
+sal_uLong SaveOrDelMSVBAStorage( sal_Bool bSaveInto, const OUString
rStorageName );
// check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
// If it exist, then return the WarningId for loosing the information.
static sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell rDocS );
-static String GetMSBasicStorageName();
+static OUString GetMSBasicStorageName();
private:
SotStorageRef xRoot;
SfxObjectShell rDocSh;
diff --git a/filter/source/msfilter/svxmsbas2.cxx
b/filter/source/msfilter/svxmsbas2.cxx
index d0b9d91..a1c4b8e 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -26,11 +26,11 @@
using namespace com::sun::star;
sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( sal_Bool bSaveInto,
-const String rStorageName )
+const OUString rStorageName )
{
sal_uLong nRet = ERRCODE_NONE;
uno::Reference embed::XStorage xSrcRoot( rDocSh.GetStorage() );
-String aDstStgName( GetMSBasicStorageName() );
+OUString aDstStgName( GetMSBasicStorageName() );
SotStorageRef xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName,
STREAM_READWRITE | STREAM_NOCREATE |
STREAM_SHARE_DENYALL ) );
if( xVBAStg.Is() !xVBAStg-GetError() )
@@ -70,9 +70,9 @@
: ERRCODE_NONE;
}
-String SvxImportMSVBasic::GetMSBasicStorageName()
+OUString SvxImportMSVBasic::GetMSBasicStorageName()
{
-return String( RTL_CONSTASCII_USTRINGPARAM( _MS_VBA_Macros ) );
+return OUString( _MS_VBA_Macros );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
To view, visit https://gerrit.libreoffice.org/1848
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5678cd4f0bbfc1603bb7f3881adb4359a25ddbc5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#48086 - add help for impress (insert - animated image)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1849
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1849/1
fdo#48086 - add help for impress (insert - animated image)
Help file was already available, just added the button to the UI dialog for
Presentation's
insert-animated image
modified: sd/source/ui/dlg/animobjs.cxx
modified: sd/source/ui/dlg/animobjs.src
modified: sd/source/ui/inc/animobjs.hrc
modified: sd/source/ui/inc/animobjs.hxx
Change-Id: I0dbc51f0630d8df001cb17c7465d0e599a5f7815
---
M sd/source/ui/dlg/animobjs.cxx
M sd/source/ui/dlg/animobjs.src
M sd/source/ui/inc/animobjs.hrc
M sd/source/ui/inc/animobjs.hxx
4 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 0c26014..870a902 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -152,6 +152,8 @@
aFtAdjustment ( this, SdResId( FT_ADJUSTMENT ) ),
aLbAdjustment ( this, SdResId( LB_ADJUSTMENT ) ),
aBtnCreateGroup ( this, SdResId( BTN_CREATE_GROUP ) ),
+aBtnHelp( this, SdResId( BTN_HELP ) ),
+
pWin( pParent ),
m_nCurrentFrame ( EMPTY_FRAMELIST ),
diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src
index ebefb83..f955d3b 100644
--- a/sd/source/ui/dlg/animobjs.src
+++ b/sd/source/ui/dlg/animobjs.src
@@ -298,6 +298,12 @@
TabStop = TRUE ;
Text [ en-US ] = Create ;
};
+HelpButton BTN_HELP
+{
+Pos = MAP_APPFONT ( 60 , 216 ) ;
+Size = MAP_APPFONT ( 41 , 14 ) ;
+TabStop = TRUE ;
+};
FixedLine GRP_ANIMATION_GROUP
{
Pos = MAP_APPFONT ( 6 , 155 ) ;
diff --git a/sd/source/ui/inc/animobjs.hrc b/sd/source/ui/inc/animobjs.hrc
index 3975e28..b39dfbf 100644
--- a/sd/source/ui/inc/animobjs.hrc
+++ b/sd/source/ui/inc/animobjs.hrc
@@ -27,6 +27,7 @@
#define BTN_REMOVE_BITMAP 8
#define BTN_REMOVE_ALL 9
#define BTN_CREATE_GROUP 10
+#define BTN_HELP 1
#define NUM_FLD_BITMAP 1
#define TIME_FIELD 1
#define FT_COUNT 1
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 1b7d36c..0d5271c 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -127,6 +127,9 @@
ListBox aLbAdjustment;
PushButton aBtnCreateGroup;
+HelpButton aBtnHelp;
+
+
::Window* pWin;
::std::vector ::std::pairBitmapEx*, Time* m_FrameList;
static const size_t EMPTY_FRAMELIST = ULONG_MAX;
--
To view, visit https://gerrit.libreoffice.org/1849
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dbc51f0630d8df001cb17c7465d0e599a5f7815
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joel Madero jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1850
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1850/1
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek Doulík r...@novell.com
Tested-by: Radek Doulík r...@novell.com
---
M drawinglayer/source/primitive2d/metafileprimitive2d.cxx
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index d168bef..7631601 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -524,8 +524,9 @@
TargetHolder Current()
{
+static TargetHolder aDummy;
OSL_ENSURE(maTargetHolders.size(), TargetHolders: CURRENT with no
property holders (!));
-return *maTargetHolders.back();
+return maTargetHolders.empty() ? aDummy : *maTargetHolders.back();
}
~TargetHolders()
--
To view, visit https://gerrit.libreoffice.org/1850
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Radek Doulík r...@novell.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1851
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1851/1
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek Doulík r...@novell.com
Tested-by: Radek Doulík r...@novell.com
---
M drawinglayer/source/primitive2d/metafileprimitive2d.cxx
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index fa5b1ae..6da553b 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -534,8 +534,9 @@
TargetHolder Current()
{
+static TargetHolder aDummy;
OSL_ENSURE(maTargetHolders.size(), TargetHolders: CURRENT with no
property holders (!));
-return *maTargetHolders.back();
+return maTargetHolders.empty() ? aDummy : *maTargetHolders.back();
}
~TargetHolders()
--
To view, visit https://gerrit.libreoffice.org/1851
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Radek Doulík r...@novell.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1852
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1852/1
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
Change-Id: I942dc0c574a9fb4ae676a86cfafafc6fd6283831
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek Doulík r...@novell.com
Tested-by: Radek Doulík r...@novell.com
---
M drawinglayer/source/primitive2d/metafileprimitive2d.cxx
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index fa5b1ae..6da553b 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -534,8 +534,9 @@
TargetHolder Current()
{
+static TargetHolder aDummy;
OSL_ENSURE(maTargetHolders.size(), TargetHolders: CURRENT with no
property holders (!));
-return *maTargetHolders.back();
+return maTargetHolders.empty() ? aDummy : *maTargetHolders.back();
}
~TargetHolders()
--
To view, visit https://gerrit.libreoffice.org/1852
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I942dc0c574a9fb4ae676a86cfafafc6fd6283831
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Radek Doulík r...@novell.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
