date:20120930

[Libreoffice-commits] .: 7 commits - codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk extensions/Executable_nsplugin.mk extension

2012-09-30 Thread Libreoffice Gerrit user

 Module_tail_build.mk  |1 +
 codemaker/StaticLibrary_codemaker.mk  |1 +
 codemaker/StaticLibrary_codemaker_cpp.mk  |1 +
 codemaker/StaticLibrary_codemaker_java.mk |1 +
 extensions/Executable_nsplugin.mk |6 ++
 extensions/source/nsplugin/source/so_instance.cxx |2 +-
 lingucomponent/StaticLibrary_ulingu.mk|   10 ++
 sax/StaticLibrary_sax_shared.mk   |4 
 sdext/StaticLibrary_pdfimport_s.mk|9 +
 sdext/source/presenter/PresenterWindowManager.hxx |1 -
 solenv/gbuild/Configuration.mk|8 
 solenv/gbuild/InternalUnoApi.mk   |9 ++---
 tail_build/prj/build.lst  |2 +-
 testtools/StaticLibrary_bridgetest.mk |5 +
 vcl/StaticLibrary_headless.mk |   13 +
 vcl/StaticLibrary_vclmain.mk  |3 +++
 writerperfect/StaticLibrary_writerperfect.mk  |   10 ++
 17 files changed, 76 insertions(+), 10 deletions(-)

New commits:
commit 9516c661e86f99cb625e13fe6e040ae74d66a3dd
Author: David Tardon 
Date:   Mon Oct 1 07:24:16 2012 +0200

add saxon to tail_build

Change-Id: I01e2b99a2618c3b4e5e80dc9e38652e75ef5217d

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index db82ee1..a0c958b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
salhelper \
sane \
sax \
+   $(call gb_Helper_optional,SAXON,saxon) \
sc \
scaddins \
sccomp \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5e84fda..4129e20 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost 
CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig 
FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen 
ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec 
LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap 
OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon 
XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
+tb  tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost 
CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig 
FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen 
ICU:icu JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec 
LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap 
OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax 
XPDF:xpdf ZLIB:zlib external RHINO:rhino sal solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 5013ebbffdd37a68c49a34e9c1b4e69c36a86912
Author: David Tardon 
Date:   Mon Oct 1 06:17:06 2012 +0200

fix InternalUnoApi IDL deps

Change-Id: I02bd49c6f6b252c6797292b8e4a9bc319fe0947e

diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 3dd32ee..8949323 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -52,7 +52,10 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1)_out)
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call 
gb_UnoApiHeadersTarget_get_clean_target,$(1))
 
-$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+$(call gb_UnoApiTarget_get_headers_target,$(1)_out) : $(gb_Helper_MISCDUMMY)
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(1)_out)
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : 
$(gb_Helper_MISCDUMMY)
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_external_headers_target,$(1)_out)
 
 $(call gb_Deliver_add_deliverable,$(call 
gb_InternalUnoApi_get_target,$(1)),$(call 
gb_UnoApiTarget_get_target,$(1)_out),$(1))
 
@@ -72,8 +75,8 @@ endef
 
 define gb_InternalUnoApi__use_api
 $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
-$(call gb_InternalUnoApi_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(2))
-$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
+$(call gb_InternalUnoApi_get_target,$(1)_out) : $(call 
gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
 
 endef
 
commit 93a3e81816e3479c0d107ba44d473134b51a7712
Author: David Tardon 
Date:   Sun Sep 30 1

[PUSHED] gbuildification of saxon

2012-09-30 Thread David Tardon (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/739


--
To view, visit https://gerrit.libreoffice.org/739
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic54337f4279daf78b099aab368eade5a6143f586
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 
Gerrit-Reviewer: David Tardon 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Easy Hack -- fdo #44718

2012-09-30 Thread Joel Madero


Hi All,

I know that we need more easy hacks, this one clearly qualifies but I 
don't have the time right now to find relevant code to point to and act 
as a go to for anyone who chooses to pick this one up. Can someone take 
a look at it real quick and see if you can point to the right files and 
throw a comment in there?


I'll keep looking for more easy hacks.

https://bugs.freedesktop.org/show_bug.cgi?id=44718


Regards,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] gbuildification of saxon

2012-09-30 Thread David Ostrovsky (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/739

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/739/1

gbuildification of saxon

Change-Id: Ic54337f4279daf78b099aab368eade5a6143f586
---
M Makefile.top
M config_host.mk.in
M configure.in
A saxon/ExternalProject_saxon.mk
A saxon/Module_saxon.mk
A saxon/Package_saxon.mk
A saxon/UnpackedTarball_saxon.mk
A saxon/build.xml
D saxon/makefile.mk
M saxon/prj/build.lst
M saxon/prj/d.lst
D saxon/prj/dmake
D saxon/saxon-9.0.0.7-bj.patch
13 files changed, 1,134 insertions(+), 1,103 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/739
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic54337f4279daf78b099aab368eade5a6143f586
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

spell checker issue

2012-09-30 Thread Steven Howe

Who deals with spell checker dictionary issues?

I'm using the work " men's "; the spell checker thinks this is wrong,
although spell checker for gmail does not. I've visited webster's
dictionary online. "men's" appears to be the correct spelling.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

2012-09-30 Thread Libreoffice Gerrit user

 sc/source/filter/excel/xecontent.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 79dbac32afd3a937e323231ec310ec1f0e476fe5
Author: Markus Mohrhard 
Date:   Sun Sep 30 20:45:36 2012 +0200

create guids that excel accepts

Change-Id: I69868ad65b6eb6405d5723cb4d65d5e30c72e3ae

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 6bef29b..abca86f 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1082,13 +1082,21 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm )
 
 namespace {
 
+rtl::OString createHexStringFromDigit(sal_uInt8 nDigit)
+{
+rtl::OString aString = rtl::OString::valueOf( 
static_cast(nDigit), 16 );
+if(aString.getLength() == 1)
+aString = aString + rtl::OString::valueOf(static_cast(0));
+return aString;
+}
+
 rtl::OString createGuidStringFromInt(sal_uInt8 nGuid[16])
 {
 rtl::OStringBuffer aBuffer;
 aBuffer.append('{');
 for(size_t i = 0; i < 16; ++i)
 {
-aBuffer.append(static_cast(nGuid[i]), 16);
+aBuffer.append(createHexStringFromDigit(nGuid[i]));
 if(i == 3|| i == 5 || i == 7 || i == 9 )
 aBuffer.append('-');
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[feature/killsdf]: Use po for merge of readme.xrm

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/738

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/738
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Use new startsWith() method of OString

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/737

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/737
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If8787b007767aa2701ff1b13883bcf33df12a8fc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Corrections for merge

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/736

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/736
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 
Gerrit-Reviewer: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - readlicense_oo/CustomTarget_readme.mk solenv/inc

2012-09-30 Thread Libreoffice Gerrit user

 readlicense_oo/CustomTarget_readme.mk |9 ++---
 solenv/inc/rules.mk   |   10 --
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit ecc7820a93ca5a8f678d75e13c2e94b1115382e2
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 19:01:17 2012 +0200

Use po for merge of readme.xrm

And delete old dmake rule

Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5
Reviewed-on: https://gerrit.libreoffice.org/738
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/readlicense_oo/CustomTarget_readme.mk 
b/readlicense_oo/CustomTarget_readme.mk
index 6c74fc6..2871631 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -36,16 +36,19 @@ readlicense_oo_README_XRM := 
$(readlicense_oo_DIR)/readme.xrm
 $(readlicense_oo_DIR)/readme.xrm : \
$(SRCDIR)/readlicense_oo/docs/readme.xrm \
$(readlicense_XRMEXTARGET) \
-   $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \
+   $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) \
| $(readlicense_oo_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1)
$(call gb_Helper_abbreviate_dirs, \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs/readme.po) 
> $${MERGEINPUT} && \
$(readlicense_XRMEXCOMMAND) \
-p readlicense_oo \
-i $< \
-o $@ \
-   -m $(gb_SDFLOCATION)/readlicense_oo/docs/localize.sdf \
-   -l all)
+   -m $${MERGEINPUT} \
+   -l all && \
+rm -rf $${MERGEINPUT})
 
 endif
 
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index b4561b9..327955f 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -701,13 +701,3 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf
 @$(COPY) $< $@.$(INPATH)
 @$(RENAME) $@.$(INPATH) $@
 @-$(RM) $@.$(INPATH)
-
-POLOCATION:=$(SRCDIR)$/translations/source
-PORELPATH:=$(PRJNAME)$/$(PATH_IN_MODULE).po
-
-$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
-$(COMMAND_ECHO)-$(MKDIR) $(@:d)
-$(COMMAND_ECHO)-$(RM) $@
-$(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m 
$(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG)) 
$(POLOCATION)/$(lang)/$(PORELPATH))) -l all
-$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/po.cxx |   22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 9d300551b3dacd3693607e1015bea1461c173e1a
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 18:26:15 2012 +0200

Use new startsWith() method of OString

Change-Id: If8787b007767aa2701ff1b13883bcf33df12a8fc
Reviewed-on: https://gerrit.libreoffice.org/737
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index b9e1c17..a922575 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -110,12 +110,6 @@ OString ImplGenNormString(const OString& rString)
 return ImplUnEscapeText(rString.copy(1,rString.getLength()-2));
 }
 
-//Decide whether a string starts with an other string
-bool ImplStartsWith(const OString& rString,const OString& rStart)
-{
-return rString.match(rStart);
-}
-
 //Default constructor
 GenPoEntry::GenPoEntry()
 : m_sWhiteSpace( OString() )
@@ -215,37 +209,37 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
 while(!rIFStream.eof())
 {
 OString sLine = OString(sTemp.data(),sTemp.length());
-if (ImplStartsWith(sLine,"#. "))
+if (sLine.startsWith("#. "))
 {
 if (sLine.getLength()==7)
 m_sKeyId = sLine.copy(3);
 else
 m_sExtractCom = sLine.copy(3);
 }
-else if (ImplStartsWith(sLine,"#: "))
+else if (sLine.startsWith("#: "))
 {
 m_sReference = sLine.copy(3);
 }
-else if (ImplStartsWith(sLine,"#, fuzzy"))
+else if (sLine.startsWith("#, fuzzy"))
 {
 m_bFuzzy = true;
 }
-else if (ImplStartsWith(sLine,"msgctxt "))
+else if (sLine.startsWith("msgctxt "))
 {
 m_sContext = ImplGenNormString(sLine.copy(8));
 pLastMsg = &m_sContext;
 }
-else if (ImplStartsWith(sLine,"msgid "))
+else if (sLine.startsWith("msgid "))
 {
 m_sUnTransStr = ImplGenNormString(sLine.copy(6));
 pLastMsg = &m_sUnTransStr;
 }
-else if (ImplStartsWith(sLine,"msgstr "))
+else if (sLine.startsWith("msgstr "))
 {
 m_sTransStr = ImplGenNormString(sLine.copy(7));
 pLastMsg = &m_sTransStr;
 }
-else if (ImplStartsWith(sLine,"\"") && pLastMsg)
+else if (sLine.startsWith("\"") && pLastMsg)
 {
 *pLastMsg += ImplGenNormString(sLine);
 }
@@ -359,7 +353,7 @@ OString ImplEscapeTags(const OString& rText)
 for(StrVec::const_iterator pEscape = vTagsForEscape.begin();
 pEscape != vTagsForEscape.end(); ++pEscape)
 {
-if (ImplStartsWith(*pFound,"<" + *pEscape) ||
+if (pFound->startsWith("<" + *pEscape) ||
 *pFound == "")
 {
 bEscapeThis = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source solenv/gbuild

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/po.cxx  |2 +-
 solenv/gbuild/ExtensionTarget.mk |8 
 solenv/gbuild/InstallModuleTarget.mk |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0359041aac89ef07325f6b8baa2d5ff304e833b5
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 17:54:37 2012 +0200

Corrections for merge

-Correct po type-checking
-Use new "lang" variable instead of
nonexistent one
-Add input parameter to ulfex

Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
Reviewed-on: https://gerrit.libreoffice.org/736
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index f929ce7..b9e1c17 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -481,7 +481,7 @@ OString PoEntry::getResourceType() const
 PoEntry::TYPE PoEntry::getType() const
 {
 const OString sContext = m_aGenPo.getContext();
-const OString sType = sContext.copy( sContext.indexOf('.') + 1 );
+const OString sType = sContext.copy( sContext.lastIndexOf('.') + 1 );
 assert( m_bIsInitialized &&
 (sType == "text" || sType == "quickhelptext" || sType == "title") );
 if ( sType == "text" )
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 559e0cf..4e53be5 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -136,9 +136,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := 
$(firstword $(subst /, ,
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : 
$(SRCDIR)/$(2)/description.xml
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_ExtensionTarget_get_target,$(1)) : \
-   POFILES := $(foreach 
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+   POFILES := $(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
 $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
-   $(foreach 
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+   $(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
 endif
 
 $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -225,9 +225,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst 
-,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2)))
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
-   POFILES := $(foreach 
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
/%/,%,$(subst $(SRCDIR),,$(dir $(3.po)
+   POFILES := $(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
/%/,%,$(subst $(SRCDIR),,$(dir $(3.po)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
-   $(foreach 
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
/%/,%,$(subst $(SRCDIR),,$(dir $(3.po)
+   $(foreach 
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
/%/,%,$(subst $(SRCDIR),,$(dir $(3.po)
 endif
 $(call gb_ExtensionTarget_get_target,$(1)) : $(call 
gb_ExtensionTarget_get_rootdir,$(1))/$(2)
 $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
diff --git a/solenv/gbuild/InstallModuleTarget.mk 
b/solenv/gbuild/InstallModuleTarget.mk
index ace8ceb..242a259 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -132,7 +132,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
-   $(call gb_ScpMergeTarget__command,$@,$*)
+   $(call gb_ScpMergeTarget__command,$@,$*,$(SCP_SOURCE))
 
 .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%)
 $(call gb_ScpMergeTarget_get_clean_target,%) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppu/inc

2012-09-30 Thread Libreoffice Gerrit user

 cppu/inc/com/sun/star/uno/Reference.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a842b5690e77de51d933bd9a4224303abba1d870
Author: Stephan Bergmann 
Date:   Sun Sep 30 19:59:02 2012 +0200

Make Reference::iset_throw work with multiple-inheritance interfaces

Change-Id: Ia8a644c613de17279abdab533a6314ba6c0e0aec

diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx 
b/cppu/inc/com/sun/star/uno/Reference.hxx
index 100a430..aa39810 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -91,7 +91,7 @@ inline interface_type * Reference< interface_type 
>::iset_throw(
 {
 if (pInterface)
 {
-pInterface->acquire();
+castToXInterface(pInterface)->acquire();
 return pInterface;
 }
 throw RuntimeException(
@@ -184,13 +184,13 @@ inline Reference< interface_type >::Reference( const Any 
& rAny, UnoReference_Qu
 template< class interface_type >
 inline Reference< interface_type >::Reference( const Reference< interface_type 
> & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
 {
-_pInterface = iset_throw( rRef.get() );
+_pInterface = castToXInterface( iset_throw( rRef.get() ) );
 }
 
//__
 template< class interface_type >
 inline Reference< interface_type >::Reference( interface_type * pInterface, 
UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
 {
-_pInterface = iset_throw( pInterface );
+_pInterface = castToXInterface( iset_throw( pInterface ) );
 }
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[feature/killsdf]: Use po for merge of readme.xrm

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/738

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/738/1

Use po for merge of readme.xrm

And delete old dmake rule

Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5
---
M readlicense_oo/CustomTarget_readme.mk
M solenv/inc/rules.mk
2 files changed, 6 insertions(+), 13 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/738
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0a18b79579337ceb40e8a440e028cf0c2867bf5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[feature/killsdf]: Use new startsWith() method of OString

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/737

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/737/1

Use new startsWith() method of OString

Change-Id: If8787b007767aa2701ff1b13883bcf33df12a8fc
---
M l10ntools/source/po.cxx
1 file changed, 8 insertions(+), 14 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/737
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8787b007767aa2701ff1b13883bcf33df12a8fc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[feature/killsdf]: Corrections for merge

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/736

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/736/1

Corrections for merge

-Correct po type-checking
-Use new "lang" variable instead of
nonexistent one
-Add input parameter to ulfex

Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
---
M l10ntools/source/po.cxx
M solenv/gbuild/ExtensionTarget.mk
M solenv/gbuild/InstallModuleTarget.mk
3 files changed, 6 insertions(+), 6 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/736
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - solenv/bin

2012-09-30 Thread Libreoffice Gerrit user

 solenv/bin/modules/installer.pm   |   72 -
 solenv/bin/modules/installer/profiles.pm  |   45 +++---
 solenv/bin/modules/installer/ziplist.pm   |   73 ++
 solenv/bin/modules/t/installer-profiles.t |   60 
 4 files changed, 154 insertions(+), 96 deletions(-)

New commits:
commit 5cc1d5ca954a594129bd81159a87f8dfb9bbffe7
Author: Tim Retout 
Date:   Sun Sep 30 13:23:43 2012 +0100

installer::profiles: Test and rewrite sorting_profile

Change-Id: Ie3c9bddcb4760d2fe2195c1ca0de7520e57d705f

diff --git a/solenv/bin/modules/installer/profiles.pm 
b/solenv/bin/modules/installer/profiles.pm
index 7b621f7..3b99973 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -42,40 +42,33 @@ use installer::systemactions;
 # Sorting the content of a profile
 ###
 
-sub sorting_profile
-{
+sub sorting_profile {
 my ($profilesref) = @_;
 
-my @profile = ();
-my @definedsections = ();
+my @sections;
+my %section_content;
 
-for ( my $i = 0; $i <= $#{$profilesref}; $i++ )
-{
+for ( my $i = 0; $i < @{$profilesref}; $i++ ) {
 my $line = ${$profilesref}[$i];
 
-if ( $line =~ /^\s*(\[.*\])\s*$/ )  # this is a section (every second 
line)
-{
-my $section = $1;
+# Skip unless this is a section (every second line)
+next unless ( $line =~ /^\s*(\[.*\])\s*$/ );
 
-if (! grep {$_ eq $section} @definedsections)
-{
-my $sectionline = $section . "\n";
-push(@definedsections, $section);
-push(@profile, $sectionline);
+my $section = $1;
+my $next_line = ${$profilesref}[$i+1];
 
-for ( my $j = 0; $j <= $#{$profilesref}; $j++ )
-{
-my $oneline = ${$profilesref}[$j];
-
installer::remover::remove_leading_and_ending_whitespaces(\$oneline);
-
-if ( $oneline eq $section )
-{
-my $nextline = ${$profilesref}[$j+1];
-push(@profile, $nextline);
-}
-}
-}
+if ( ! exists $section_content{$section} ) {
+push @sections, $section;
 }
+
+push @{ $section_content{$section} }, $next_line;
+}
+
+my @profile;
+
+for my $section (@sections) {
+push @profile, "$section\n";
+push @profile, @{ $section_content{$section} };
 }
 
 return \@profile;
diff --git a/solenv/bin/modules/t/installer-profiles.t 
b/solenv/bin/modules/t/installer-profiles.t
new file mode 100644
index 000..841af14
--- /dev/null
+++ b/solenv/bin/modules/t/installer-profiles.t
@@ -0,0 +1,60 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2012 Tim Retout  (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use lib '.';
+
+use installer::profiles;
+
+my @input = map { "$_\n" } split "\n", <<'END';
+  [foo]
+1
+NOT SEEN
+  [bar]
+3
+  [foo]
+2
+[bar]
+4
+END
+
+my @expected = map { "$_\n" } split "\n", <<'END';
+[foo]
+1
+2
+[bar]
+3
+4
+END
+
+my $result = installer::profiles::sorting_profile(\@input);
+
+is_deeply($result, \@expected);
+
+done_testing();
commit 665785c073f695922603854a9d2d5ecab4061ff0
Author: Tim Retout 
Date:   Sun Sep 30 13:15:23 2012 +0100

installer: Create new read_ziplist function.

Change-Id: Ie91376bf9c52238febdc15720bb7f4cd62ee2e08

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 54b64b0..4c50d3b 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -82,7 +82,7 @@ use installer::windows::strip;
 use installer::windows::update;
 use installer::windows::upgrade;
 use installer::worker;
-use installer::ziplist;
+use installer::ziplist qw(read_ziplist);
 
 our @E

[PUSHED] Change in core[feature/killsdf]: Correct escaping tags

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/735

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/735
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd5939316ac84a3e569a9cbc04e38edda59dead1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Add correct input for helpex

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/733

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/733
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I890f6a51ebef1ae40647859b11ab4c46c02eb13b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/po.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 004f4fae87fe4fe3c31948d55206291b6de64ba9
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 16:33:47 2012 +0200

Correct escaping tags

which worked wrong with some language like Asturian

Change-Id: Icd5939316ac84a3e569a9cbc04e38edda59dead1
Reviewed-on: https://gerrit.libreoffice.org/735
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 0649efe..f929ce7 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -330,7 +330,9 @@ void ImplFindAllTag(const OString& 
rText,std::vector& o_vFoundTags)
 {
 ImplMinimize(sTemp,aRegExp,aRegs);
 o_vFoundTags.push_back(
-rText.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0]));
+OUStringToOString(
+sTemp.copy(aRegs.start[0],aRegs.end[0]-aRegs.start[0]),
+RTL_TEXTENCODING_UTF8));
 nStart = aRegs.end[0];
 memset(static_cast(&aRegs), 0, sizeof(re_registers));
 aRegExp.re_search(&aRegs,nStart);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/gbuild

2012-09-30 Thread Libreoffice Gerrit user

 solenv/gbuild/ExtensionTarget.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 408acea40bf2e4dfaa5fc79779de0611b367128a
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 16:02:39 2012 +0200

Add correct input for helpex

Helpex waits for a file which contains path
of po file not a path directly
Delete unneeded slash

Change-Id: I890f6a51ebef1ae40647859b11ab4c46c02eb13b
Reviewed-on: https://gerrit.libreoffice.org/733
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 481c4b9..559e0cf 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -300,9 +300,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done 
: \
 ifneq ($(strip $(gb_WITH_LANG)),)
 ifneq ($(filter-out en-US,$(5)),)
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
-   POFILE := $(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst 
/$(lastword $(subst /, ,$(3))),.po,$(3))
+   POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst 
/$(lastword $(subst /, ,$(3))),.po,$(3))
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
-$(gb_POLOCATION)/$(5)/$(subst $(SRCDIR),,$(2))/$(subst /$(lastword 
$(subst /, ,$(3))),.po,$(3))
+$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))/$(subst /$(lastword 
$(subst /, ,$(3))),.po,$(3))
 endif
 endif
 $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
@@ -314,8 +314,11 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) 
: \
$$(call gb_Helper_abbreviate_dirs, \
 mkdir -p $$(dir $$@) && \
 $(if $(filter-out en-US,$(5)), \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $$(POFILE) > {MERGEINPUT} && \
 $(gb_ExtensionTarget_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) \
--m $$(POFILE), \
+-m {MERGEINPUT} && \
+rm -rf {MERGEINPUT}, \
 cp $$< $$@))
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cross_tail_build/prj

2012-09-30 Thread Libreoffice Gerrit user

 cross_tail_build/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 287050d68870a519161c649a4130d0e49a6c8beb
Author: David Tardon 
Date:   Sun Sep 30 16:59:02 2012 +0200

add sal and xml2cmp back to build.pl deps

Change-Id: Ia5607c977958317f3aca9061553cbfedb35944fa

diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index ec26db2..995bae7 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctbcross_tail_build::  BERKELEYDB:berkeleydb BOOST:boost 
CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag 
LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools ZLIB:zlib NULL
+ctbcross_tail_build::  BERKELEYDB:berkeleydb BOOST:boost 
CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag 
LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools NATIVE:xml2cmp ZLIB:zlib 
NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[feature/killsdf]: Use ascii charachters to seperate qtzi

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/731

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/731
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8715fc2a05df9d84b34945618184c99d54de6579
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Make error message clearer in localize

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/730

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/730
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I167b31bf0f550222accdda8ee5a03d8e4a742d63
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Move setting of po msgid to constructor

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/729

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/729
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If6ebe46cea93e378c9060f2c3ced09ab44a3d82a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Not use initializer-list for vector

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/726

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/726
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ed72b28be3ad00224cbf7308b4f27a6fb25e24e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 
Gerrit-Reviewer: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[feature/killsdf]: Make Po classes robuster

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/728

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/728
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic11ce3b9eee9a9fa9fbc4ccda154623160ad9d8a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/merge.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1cbd2dc05c6765754891a909ff53f1852a878a5
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 13:11:54 2012 +0200

Use ascii charachters to seperate qtzi

Because previous used charachters cause warnings

Change-Id: I8715fc2a05df9d84b34945618184c99d54de6579
Reviewed-on: https://gerrit.libreoffice.org/731
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 7e6c595..b9fe90f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -265,8 +265,8 @@ MergeDataFile::MergeDataFile(
 InsertEntry(
 aActPo.getResourceType(), aActPo.getGroupId(),
 aActPo.getLocalId(), sHACK, "qtz",
-sQTZText + "â" + sExText, sQTZQHText + "â" + sExQHText,
-sQTZTitle + "â" + sExTitle, sFileName, bCaseSensitive );
+sQTZText + "||" + sExText, sQTZQHText + "||" + sExQHText,
+sQTZTitle + "||" + sExTitle, sFileName, bCaseSensitive );
 }
 }
 aPoInput.close();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[feature/killsdf]: Make l10ntools works with i18nregexp

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/725

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/725
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I80d3dbc19856d518ed8a94dba227372f5f74ec47
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Update in Brazilian autocorrection

2012-09-30 Thread Andras Timar (via Code Review)

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/724

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/724
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcd7410f659a76ac34f18bb561b2eaffa6ecbd3d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/localize.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4869d45d8e6ba43f422ee3aa05b7c0baca28d1e0
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 12:47:56 2012 +0200

Make error message clearer in localize

which is written out when one of executables
writes out invalid sdf line

Change-Id: I167b31bf0f550222accdda8ee5a03d8e4a742d63
Reviewed-on: https://gerrit.libreoffice.org/730
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 87ee83b..6bc92a8 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -299,7 +299,11 @@ void handleCommand(
 {
 if(aException == PoEntry::INVALIDSDFLINE)
 {
-std::cerr << executable << "'s input is invalid\n";
+std::cerr
+<< executable
+<< "'s output is invalid:\n"
+<< sLine.replaceAll("\t","\\t").getStr()
+<< std::endl;
 throw false; //TODO
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/po.cxx |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 0e138f246cc490df35046bba83e459164620ca77
Author: Zolnai TamÃ¡s 
Date:   Sun Sep 30 12:08:04 2012 +0200

Move setting of po msgid to constructor

because this is part of initialization

Change-Id: If6ebe46cea93e378c9060f2c3ced09ab44a3d82a
Reviewed-on: https://gerrit.libreoffice.org/729
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index cf0b963..0649efe 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -427,7 +427,9 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
   only three element*/
 }
 m_aGenPo.setContext(sContext);
-setUnTransStr(vParts[eType]);
+m_aGenPo.setUnTransStr(
+ImplUnEscapeSDFText(
+vParts[eType],vParts[SOURCEFILE].endsWith(".xhp")));
 m_aGenPo.genKeyId();
 m_bIsInitialized = true;
 }
@@ -522,14 +524,6 @@ OString PoEntry::getTransStr() const
 
 }
 
-//Set translation string when input is in sdf format
-void PoEntry::setUnTransStr(const OString& rUnTransStr)
-{
-m_aGenPo.setUnTransStr(
-ImplUnEscapeSDFText(
-rUnTransStr,getSourceFile().endsWith(".xhp")));
-}
-
 //Set translated string when input is in sdf format
 void PoEntry::setTransStr(const OString& rTransStr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/inc/po.hxx  |   74 +++-
 l10ntools/source/localize.cxx |   52 +---
 l10ntools/source/merge.cxx|   98 +++-
 l10ntools/source/po.cxx   |  246 ++
 l10ntools/source/renewpo.cxx  |   88 +--
 5 files changed, 426 insertions(+), 132 deletions(-)

New commits:
commit ca12be682f28969b15b30539230ca40de88fc36d
Author: Zolnai TamÃ¡s 
Date:   Fri Sep 28 17:52:13 2012 +0200

Make Po classes robuster

-Make PoOfstream\PoIfstream classes for
checked po input\output
-Make copyability obvious
-Handle runtime errors with exceptions
-Use assertions to define exceptations
for programmers
Plus some correction
-Use simplier indentation
-In renewpo.cxx, define sdf file as a tempfile
instead of make it in current location
-Use constructor to renew poheader
-Use const where needed

Change-Id: Ic11ce3b9eee9a9fa9fbc4ccda154623160ad9d8a
Reviewed-on: https://gerrit.libreoffice.org/728
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 686c9f3..76312a4 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -12,10 +12,15 @@
 
 #include 
 #include 
+#include 
+
+class PoOfstream;
+class PoIfstream;
 
 class GenPoEntry
 {
 private:
+
 OStringm_sWhiteSpace;
 OStringm_sExtractCom;
 OStringm_sReference;
@@ -27,8 +32,10 @@ private:
 OStringm_sKeyId;
 
 public:
+
 GenPoEntry();
 virtual ~GenPoEntry();
+//Default copy constructor and copy operator work well
 
 virtual OString getWhiteSpace() const   { return m_sWhiteSpace; }
 virtual OString getExtractCom() const   { return m_sExtractCom; }
@@ -49,25 +56,33 @@ public:
 virtual voidsetFuzzy(const bool bFuzzy);
 virtual voidgenKeyId();
 
-virtual voidwriteToFile(std::ofstream& rOFStream);
+virtual voidwriteToFile(std::ofstream& rOFStream) const;
 virtual voidreadFromFile(std::ifstream& rIFStream);
 };
 
 class PoEntry
 {
 private:
+
 GenPoEntry m_aGenPo;
+bool m_bIsInitialized;
 
 public:
-enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID,
+
+friend class PoOfstream;
+friend class PoIfstream;
+
+enum SDFPART { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID,
 LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID,
 TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP };
 enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE };
+enum Exception { INVALIDSDFLINE };
 
 PoEntry();
 PoEntry(const OString& rSDFLine,
 const TYPE eType = TTEXT);
 ~PoEntry();
+//Default copy constructor and copy operator work well
 
 OString getSourceFile() const;
 OString getGroupId() const;
@@ -77,15 +92,11 @@ public:
 OString getUnTransStr() const;
 OString getTransStr() const;
 boolgetFuzzy() const;
-boolisNull() const;
 OString getKeyId() const;
 voidsetUnTransStr(const OString& rUnTransStr);
 voidsetTransStr(const OString& rTransStr);
 voidsetFuzzy(const bool bFuzzy);
 
-voidwriteToFile(std::ofstream& rOFStream);
-voidreadFromFile(std::ifstream& rIFStream);
-
 static bool IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2);
 
 };
@@ -93,16 +104,63 @@ public:
 class PoHeader
 {
 private:
+
 GenPoEntry m_aGenPo;
+bool m_bIsInitialized;
 
 public:
+
+friend class PoOfstream;
+friend class PoIfstream;
+
 PoHeader();
 PoHeader( const OString& rExtSrc );
+PoHeader( std::ifstream& rOldPo );
 ~PoHeader();
+//Default copy constructor and copy operator work well
 
 OString getLanguage() const;
-voidwriteToFile(std::ofstream& rOFStream);
-voidreadFromFile(std::ifstream& rIFStream);
+};
+
+class PoOfstream: private boost::noncopyable
+{
+private:
+
+std::ofstream   m_aOutPut;
+boolm_bIsAfterHeader;
+
+public:
+PoOfstream();
+~PoOfstream();
+boolisOpen() const  { return m_aOutPut.is_open(); }
+
+voidopen(const OString& rFileName);
+voidclose();
+voidwriteHeader(const PoHeader& rHeader);
+voidwriteEntry(const PoEntry& rPo);
+};
+
+class PoIfstream: private boost::noncopyable
+{
+private:
+
+std::ifstream   m_aInPut;
+boolm_bIsAfterHeader;
+boolm_bEof;
+
+public:
+
+enum Exception { INVALIDENTRY, INVALIDHEADER };
+
+PoIfstream();
+~PoIfstream(

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/source

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/source/po.cxx  |   10 ++
 l10ntools/source/renewpo.cxx |7 ---
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 9baaced8b636e23045495c9a018d0859a9df8e76
Author: Zolnai TamÃ¡s 
Date:   Sat Sep 29 21:01:30 2012 +0200

Not use initializer-list for vector

Change-Id: I6ed72b28be3ad00224cbf7308b4f27a6fb25e24e
Reviewed-on: https://gerrit.libreoffice.org/726
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index f433aab..b2082a7 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -338,10 +338,12 @@ void ImplFindAllTag(const OString& 
rText,std::vector& o_vFoundTags)
 OString ImplEscapeTags(const OString& rText)
 {
 typedef std::vector StrVec;
-const StrVec vTagsForEscape =
-  { "ahelp", "link", "item", "emph", "defaultinline",
-"switchinline", "caseinline", "variable",
-"bookmark_value", "image", "embedvar", "alt" };
+const OString vInitializer[] = {
+"ahelp", "link", "item", "emph", "defaultinline",
+"switchinline", "caseinline", "variable",
+"bookmark_value", "image", "embedvar", "alt" };
+const StrVec vTagsForEscape( vInitializer,
+vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) );
 StrVec vFoundTags;
 ImplFindAllTag(rText,vFoundTags);
 OString sResult = rText;
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index 398b23b..39152a7 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -116,9 +116,10 @@ void HandleLanguage(struct dirent* pLangEntry, const 
OString& rPath,
 {
 sActTrans ="";
 }
-const vector vTypes = { PoEntry::TTEXT,
-   PoEntry::TQUICKHELPTEXT,
-   PoEntry::TTITLE };
+const PoEntry::TYPE vInitializer[] =
+{ PoEntry::TTEXT, PoEntry::TQUICKHELPTEXT, PoEntry::TTITLE };
+const vector vTypes( vInitializer,
+vInitializer + sizeof(vInitializer) / sizeof(vInitializer[0]) );
 unsigned short nDummyBit = 0;
 for( unsigned nIndex=0; nIndex___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/Executable_uiex.mk l10ntools/prj

2012-09-30 Thread Libreoffice Gerrit user

 l10ntools/Executable_uiex.mk |1 +
 l10ntools/prj/build.lst  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a6e55d489b611e8dedf001c7897b6b60519fb89a
Author: Zolnai TamÃ¡s 
Date:   Sat Sep 29 20:58:39 2012 +0200

Make l10ntools works with i18nregexp

Change-Id: I80d3dbc19856d518ed8a94dba227372f5f74ec47
Reviewed-on: https://gerrit.libreoffice.org/725
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index ca4d726..052f9d0 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Executable_set_include,uiex,\
 
 $(eval $(call gb_Executable_use_libraries,uiex,\
 sal \
+i18nregexp \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,uiex,\
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
index 5f7fca1..888b234 100644
--- a/l10ntools/prj/build.lst
+++ b/l10ntools/prj/build.lst
@@ -1,3 +1,3 @@
-tr l10ntools : EXPAT:expat LIBXSLT:libxslt sal NULL
+tr l10ntools : EXPAT:expat LIBXSLT:libxslt sal regexp NULL
 tr l10ntools   usr1-   all 
tr_mkout NULL
 tr l10ntools\prj   nmake   -   all 
tr_prj NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extras/source

2012-09-30 Thread Libreoffice Gerrit user

 extras/source/autotext/lang/pt-BR/acor/DocumentList.xml   |1 
 extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml |   34 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit 3f3da5dff94412b432c0cd8abc2487c8b8e4
Author: Olivier Hallot 
Date:   Sat Sep 29 16:21:02 2012 -0300

Update in Brazilian autocorrection

Change-Id: Ifcd7410f659a76ac34f18bb561b2eaffa6ecbd3d
Reviewed-on: https://gerrit.libreoffice.org/724
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml 
b/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml
index 13d65e3..22c5198 100644
--- a/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/pt-BR/acor/DocumentList.xml
@@ -1012,6 +1012,7 @@
 
 
 
+
 
 
 
diff --git a/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml 
b/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml
index 45c2415..969d472 100644
--- a/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml
+++ b/extras/source/autotext/lang/pt-BR/acor/WordExceptList.xml
@@ -1,20 +1,20 @@
 
 http://openoffice.org/2001/block-list";>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[feature/killsdf]: Correct escaping tags

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/735

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/735/1

Correct escaping tags

which worked wrong with some language like Asturian

Change-Id: Icd5939316ac84a3e569a9cbc04e38edda59dead1
---
M l10ntools/source/po.cxx
1 file changed, 3 insertions(+), 1 deletion(-)


--
To view, visit https://gerrit.libreoffice.org/735
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd5939316ac84a3e569a9cbc04e38edda59dead1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Replace usage of rtl_*Memory with equivalent from string.h

2012-09-30 Thread Arnaud Versini (via Code Review)

Arnaud Versini has abandoned this change.

Change subject: Replace usage of rtl_*Memory with equivalent from string.h
..


Patch Set 1: Abandoned

--
To view, visit https://gerrit.libreoffice.org/732
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I477532cd14cb362853b800746968469ec32cbed7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini 
Gerrit-Reviewer: Arnaud Versini 
Gerrit-Reviewer: Norbert Thiebaud 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Replace usage of rtl_*Memory with equivalent from string.h

2012-09-30 Thread Arnaud Versini (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/734

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/734/1

Replace usage of rtl_*Memory with equivalent from string.h

Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159
---
M accessibility/source/standard/vclxaccessibletoolbox.cxx
M animations/source/animcore/animcore.cxx
M basctl/source/dlged/dlged.cxx
M basebmp/source/bitmapdevice.cxx
M basegfx/inc/basegfx/raster/bpixelraster.hxx
M basegfx/inc/basegfx/raster/bzpixelraster.hxx
M basic/source/basmgr/basmgr.cxx
M basic/source/runtime/iosys.cxx
M basic/source/uno/scriptcont.cxx
M binaryurp/source/writer.cxx
M bridges/source/jni_uno/nativethreadpool.cxx
M canvas/source/directx/dx_9rm.cxx
M canvas/source/directx/dx_surfacebitmap.cxx
M canvas/source/null/null_canvasfont.cxx
M chart2/source/controller/main/ChartRenderer.cxx
M chart2/source/model/main/ChartModel.cxx
M chart2/source/view/main/ChartView.cxx
M codemaker/source/codemaker/global.cxx
M cppu/source/typelib/static_types.cxx
M cppu/source/uno/eq.hxx
M dbaccess/source/core/api/RowSet.cxx
M dbaccess/source/core/api/SingleSelectQueryComposer.cxx
M dbaccess/source/core/api/TableDeco.cxx
M dbaccess/source/core/api/querycomposer.cxx
M dbaccess/source/core/api/querydescriptor.cxx
M dbaccess/source/core/api/table.cxx
M dbaccess/source/core/dataaccess/ContentHelper.cxx
M dbaccess/source/core/dataaccess/databasecontext.cxx
M dbaccess/source/ui/browser/sbagrid.cxx
M dbaccess/source/ui/querydesign/JoinExchange.cxx
M desktop/source/deployment/misc/dp_misc.cxx
M desktop/source/deployment/registry/configuration/dp_configuration.cxx
M desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
M dtrans/source/win32/dtobj/FmtFilter.cxx
M dtrans/source/win32/misc/ImplHelper.cxx
M dtrans/source/win32/workbench/test_wincb.cxx
M editeng/source/uno/unofield.cxx
M editeng/source/uno/unotext.cxx
M extensions/source/ole/oleobjw.cxx
M extensions/source/update/feed/updatefeed.cxx
M extensions/workben/testpgp.cxx
M forms/source/component/Columns.cxx
M forms/source/component/imgprod.cxx
M forms/source/richtext/richtextmodel.cxx
M framework/source/fwi/uielement/constitemcontainer.cxx
M framework/source/fwi/uielement/rootitemcontainer.cxx
M jvmfwk/source/framework.cxx
M lotuswordpro/source/filter/xfilter/xfbase64.cxx
M lotuswordpro/source/filter/xfilter/xfcolor.cxx
M lotuswordpro/source/filter/xfilter/xfdate.cxx
M lotuswordpro/source/filter/xfilter/xflineheight.hxx
M lotuswordpro/source/filter/xfilter/xfutil.hxx
M package/source/zipapi/MemoryByteGrabber.hxx
M rdbmaker/inc/codemaker/registry.hxx
M rdbmaker/source/rdbmaker/typeblop.cxx
M registry/source/regimpl.cxx
M reportdesign/source/core/api/ReportDefinition.cxx
M reportdesign/source/core/api/Section.cxx
M rsc/source/tools/rsctools.cxx
M sdext/source/pdfimport/filterdet.cxx
M sdext/source/pdfimport/pdfparse/pdfentries.cxx
M sdext/source/pdfimport/pdfparse/pdfparse.cxx
M sfx2/source/control/thumbnailviewacc.cxx
M sfx2/source/explorer/nochaos.cxx
M starmath/source/mathmlexport.cxx
M starmath/source/mathmlimport.cxx
M starmath/source/unomodel.cxx
M store/source/store.cxx
M store/workben/t_base.cxx
M store/workben/t_file.cxx
M svtools/source/control/valueacc.cxx
M svtools/source/filter/filter.cxx
M svtools/source/graphic/graphic.cxx
M svtools/source/misc/transfer.cxx
M svx/source/accessibility/AccessibleShape.cxx
M svx/source/dialog/dlgctrl.cxx
M svx/source/fmcomp/fmgridif.cxx
M svx/source/fmcomp/gridcell.cxx
M svx/source/unodraw/unopage.cxx
M svx/source/unodraw/unoshap2.cxx
M svx/source/unodraw/unoshap3.cxx
M svx/source/unodraw/unoshape.cxx
M sw/source/core/undo/undraw.cxx
M toolkit/inc/toolkit/helper/macros.hxx
M toolkit/source/awt/vclxbitmap.cxx
M toolkit/source/awt/vclxcontainer.cxx
M toolkit/source/awt/vclxdevice.cxx
M toolkit/source/awt/vclxfont.cxx
M toolkit/source/awt/vclxgraphics.cxx
M toolkit/source/awt/vclxmenu.cxx
M toolkit/source/awt/vclxpointer.cxx
M toolkit/source/awt/vclxprinter.cxx
M toolkit/source/awt/vclxregion.cxx
M toolkit/source/awt/vclxtoolkit.cxx
M toolkit/source/awt/vclxwindow.cxx
M toolkit/source/controls/stdtabcontroller.cxx
M toolkit/source/controls/stdtabcontrollermodel.cxx
M toolkit/source/controls/unocontrol.cxx
M toolkit/source/controls/unocontrolcontainer.cxx
M toolkit/source/controls/unocontrolmodel.cxx
M tools/source/generic/config.cxx
M tools/source/inet/inetstrm.cxx
M tools/source/string/tustring.cxx
M ucb/source/ucp/ftp/ftpcontent.cxx
M ucb/source/ucp/ftp/ftpurl.cxx
M ucb/source/ucp/ftp/test_ftpurl.cxx
M ucb/source/ucp/gio/gio_inputstream.cxx
M ucb/source/ucp/gio/gio_outputstream.cxx
M ucb/source/ucp/gio/gio_seekable.cxx
M ucb/source/ucp/gvfs/gvfs_stream.cxx
M ucb/source/ucp/webdav/NeonInputStream.cxx
M ucb/source/ucp/webdav/NeonSession.cxx
M unotools/source/ucbhelper/ucblockbytes.cxx
M unoxml/source/dom/documentbuilder.cxx
M unoxml/source/dom/node.cxx
M vcl/unx/generic/app/sm.cxx
M writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
M

[PATCH] Change in core[feature/killsdf]: Add correct input for helpex

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/733

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/733/1

Add correct input for helpex

Helpex waits for a file which contains path
of po file not a path directly
Delete unneeded slash

Change-Id: I890f6a51ebef1ae40647859b11ab4c46c02eb13b
---
M solenv/gbuild/ExtensionTarget.mk
1 file changed, 6 insertions(+), 3 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/733
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I890f6a51ebef1ae40647859b11ab4c46c02eb13b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: writerfilter/source

2012-09-30 Thread Libreoffice Gerrit user

 writerfilter/source/dmapper/DomainMapper.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e8103258e2c744acbcb74bb0b90324d50cc880a5
Author: Miklos Vajna 
Date:   Sun Sep 30 16:01:54 2012 +0200

writerfilter: unused includes in DomainMapper

Change-Id: Ia84271c5fe7064bfa2d71b84da9fa4d9df945d51

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index cfd8dad..8b51034 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -54,12 +54,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
-#include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

2012-09-30 Thread Libreoffice Gerrit user

 sw/qa/extras/rtfimport/rtfimport.cxx |   65 +--
 1 file changed, 10 insertions(+), 55 deletions(-)

New commits:
commit 61395b51896f091d002896fc6fe0f5d2c8624590
Author: Miklos Vajna 
Date:   Sun Sep 30 15:50:53 2012 +0200

sw: finish cleanup of rtfimport test

Change-Id: I10433c3c40a0c648bd651ed786ecd5523bf58f61

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 30e03ce..61813f1 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -617,15 +617,7 @@ void Test::testFdo49271()
 {
 load("fdo49271.rtf");
 
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
-xParaEnum->nextElement();
-uno::Reference xPropertySet(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-float fValue = 0;
-xPropertySet->getPropertyValue("CharHeight") >>= fValue;
-
-CPPUNIT_ASSERT_EQUAL(25.f, fValue);
+CPPUNIT_ASSERT_EQUAL(25.f, getProperty(getParagraph(2), 
"CharHeight"));
 }
 
 void Test::testFdo49692()
@@ -642,12 +634,7 @@ void Test::testFdo49692()
 const beans::PropertyValue& rProp = aProps[i];
 
 if (rProp.Name == "Suffix")
-{
-OUString sValue;
-rProp.Value >>= sValue;
-
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), sValue.getLength());
-}
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
rProp.Value.get().getLength());
 }
 }
 
@@ -655,54 +642,28 @@ void Test::testFdo45190()
 {
 load("fdo45190.rtf");
 
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
-
 // inherited \fi should be reset
-uno::Reference xPropertySet(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-sal_Int32 nValue = 0;
-xPropertySet->getPropertyValue("ParaFirstLineIndent") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(getParagraph(1), 
"ParaFirstLineIndent"));
 
 // but direct one not
-xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY);
-xPropertySet->getPropertyValue("ParaFirstLineIndent") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-100)), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-100)), 
getProperty(getParagraph(2), "ParaFirstLineIndent"));
 }
 
 void Test::testFdo50539()
 {
 load("fdo50539.rtf");
 
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
-uno::Reference 
xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
-uno::Reference xRunEnum = 
xRunEnumAccess->createEnumeration();
-uno::Reference xPropertySet(xRunEnum->nextElement(), 
uno::UNO_QUERY);
-sal_Int32 nValue = 0;
 // \chcbpat with zero argument should mean the auto (-1) color, not a 
default color (black)
-xPropertySet->getPropertyValue("CharBackColor") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), 
getProperty(getRun(getParagraph(1), 1), "CharBackColor"));
 }
 
 void Test::testFdo50665()
 {
 load("fdo50665.rtf");
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference 
xParaEnum(xParaEnumAccess->createEnumeration());
-uno::Reference 
xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
-uno::Reference 
xRunEnum(xRunEnumAccess->createEnumeration());
-
 // Access the second run, which is a textfield
-xRunEnum->nextElement();
-uno::Reference xRun(xRunEnum->nextElement(), 
uno::UNO_QUERY);
-OUString aValue;
-xRun->getPropertyValue("CharFontName") >>= aValue;
+uno::Reference xRun(getRun(getParagraph(1), 2), 
uno::UNO_QUERY);
 // This used to be the default, as character properties were ignored.
-CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), aValue);
+CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), getProperty(xRun, 
"CharFontName"));
 }
 
 void Test::testFdo49659()
@@ -717,12 +678,8 @@ void Test::testFdo49659()
 // The graphic was also empty
 uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
-uno::Reference xPropertySet(xDraws->getByIndex(0), 
uno::UNO_QUERY);
-uno::Reference xGraphic;
-xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
-sal_Int8 nValue = 0;
-xGraphic->getPropertyValue("GraphicType") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(graphic::GraphicType::PIXEL, nValue);
+uno::Reference xGraph

[PATCH] Replace usage of rtl_*Memory with equivalent from string.h

2012-09-30 Thread Arnaud Versini (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/732

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/732/1

Replace usage of rtl_*Memory with equivalent from string.h

Change-Id: I477532cd14cb362853b800746968469ec32cbed7
---
M accessibility/source/standard/vclxaccessibletoolbox.cxx
M animations/source/animcore/animcore.cxx
M basctl/source/dlged/dlged.cxx
M basebmp/source/bitmapdevice.cxx
M basegfx/inc/basegfx/raster/bpixelraster.hxx
M basegfx/inc/basegfx/raster/bzpixelraster.hxx
M basic/source/basmgr/basmgr.cxx
M basic/source/runtime/iosys.cxx
M basic/source/uno/scriptcont.cxx
M binaryurp/source/writer.cxx
M bridges/source/jni_uno/nativethreadpool.cxx
M canvas/source/directx/dx_9rm.cxx
M canvas/source/directx/dx_surfacebitmap.cxx
M canvas/source/null/null_canvasfont.cxx
M chart2/source/controller/main/ChartRenderer.cxx
M chart2/source/model/main/ChartModel.cxx
M chart2/source/view/main/ChartView.cxx
M codemaker/source/codemaker/global.cxx
M cppu/source/typelib/static_types.cxx
M cppu/source/uno/eq.hxx
M dbaccess/source/core/api/RowSet.cxx
M dbaccess/source/core/api/SingleSelectQueryComposer.cxx
M dbaccess/source/core/api/TableDeco.cxx
M dbaccess/source/core/api/querycomposer.cxx
M dbaccess/source/core/api/querydescriptor.cxx
M dbaccess/source/core/api/table.cxx
M dbaccess/source/core/dataaccess/ContentHelper.cxx
M dbaccess/source/core/dataaccess/databasecontext.cxx
M dbaccess/source/ui/browser/sbagrid.cxx
M dbaccess/source/ui/querydesign/JoinExchange.cxx
M desktop/source/deployment/misc/dp_misc.cxx
M desktop/source/deployment/registry/configuration/dp_configuration.cxx
M desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
M dtrans/source/win32/dtobj/FmtFilter.cxx
M dtrans/source/win32/misc/ImplHelper.cxx
M dtrans/source/win32/workbench/test_wincb.cxx
M editeng/source/uno/unofield.cxx
M editeng/source/uno/unotext.cxx
M extensions/source/ole/oleobjw.cxx
M extensions/source/update/feed/updatefeed.cxx
M extensions/workben/testpgp.cxx
M forms/qa/integration/forms/CellBinding.java
M forms/qa/integration/forms/DocumentType.java
M forms/qa/integration/forms/DocumentViewHelper.java
M forms/qa/integration/forms/FormControlTest.java
M forms/qa/integration/forms/RadioButtons.java
M forms/qa/org/openoffice/xforms/Instance.java
M forms/source/component/Columns.cxx
M forms/source/component/imgprod.cxx
M forms/source/misc/InterfaceContainer.cxx
M forms/source/misc/limitedformats.cxx
M forms/source/richtext/parametrizedattributedispatcher.cxx
M forms/source/richtext/richtextcontrol.cxx
M forms/source/richtext/richtextimplcontrol.hxx
M forms/source/richtext/richtextmodel.cxx
M forms/source/solar/component/navbarcontrol.cxx
M framework/source/fwi/uielement/constitemcontainer.cxx
M framework/source/fwi/uielement/rootitemcontainer.cxx
M jvmfwk/source/framework.cxx
M lotuswordpro/source/filter/xfilter/xfbase64.cxx
M lotuswordpro/source/filter/xfilter/xfcolor.cxx
M lotuswordpro/source/filter/xfilter/xfdate.cxx
M lotuswordpro/source/filter/xfilter/xflineheight.hxx
M lotuswordpro/source/filter/xfilter/xfutil.hxx
M package/source/zipapi/MemoryByteGrabber.hxx
M rdbmaker/inc/codemaker/registry.hxx
M rdbmaker/source/rdbmaker/typeblop.cxx
M registry/source/regimpl.cxx
M reportdesign/source/core/api/ReportDefinition.cxx
M reportdesign/source/core/api/Section.cxx
M rsc/source/tools/rsctools.cxx
M sal/inc/rtl/ustring.hxx
M sal/osl/w32/pipe.c
M sal/osl/w32/profile.cxx
M sal/rtl/source/byteseq.cxx
M sal/rtl/source/cipher.cxx
M sal/rtl/source/digest.cxx
M sal/rtl/source/strbuf.cxx
M sal/rtl/source/string.cxx
M sal/rtl/source/ustrbuf.cxx
M sal/rtl/source/ustring.cxx
M sdext/source/pdfimport/filterdet.cxx
M sdext/source/pdfimport/pdfparse/pdfentries.cxx
M sdext/source/pdfimport/pdfparse/pdfparse.cxx
M sfx2/source/control/thumbnailviewacc.cxx
M sfx2/source/explorer/nochaos.cxx
M starmath/source/mathmlexport.cxx
M starmath/source/mathmlimport.cxx
M starmath/source/unomodel.cxx
M store/source/store.cxx
M store/workben/t_base.cxx
M store/workben/t_file.cxx
M svtools/source/control/valueacc.cxx
M svtools/source/filter/filter.cxx
M svtools/source/graphic/graphic.cxx
M svtools/source/misc/transfer.cxx
M svx/source/accessibility/AccessibleShape.cxx
M svx/source/dialog/dlgctrl.cxx
M svx/source/fmcomp/fmgridif.cxx
M svx/source/fmcomp/gridcell.cxx
M svx/source/unodraw/unopage.cxx
M svx/source/unodraw/unoshap2.cxx
M svx/source/unodraw/unoshap3.cxx
M svx/source/unodraw/unoshape.cxx
M sw/source/core/undo/undraw.cxx
M toolkit/inc/toolkit/helper/macros.hxx
M toolkit/source/awt/vclxbitmap.cxx
M toolkit/source/awt/vclxcontainer.cxx
M toolkit/source/awt/vclxdevice.cxx
M toolkit/source/awt/vclxfont.cxx
M toolkit/source/awt/vclxgraphics.cxx
M toolkit/source/awt/vclxmenu.cxx
M toolkit/source/awt/vclxpointer.cxx
M toolkit/source/awt/vclxprinter.cxx
M toolkit/source/awt/vclxregion.cxx
M toolkit/source/awt/vclxtoolkit.cxx
M toolkit/source/awt/vclxwindow.cxx
M toolkit/source/controls/stdtabcontrolle

[Libreoffice-commits] .: sw/qa

2012-09-30 Thread Libreoffice Gerrit user

 sw/qa/extras/rtfimport/rtfimport.cxx |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 6ce7a5bd5709206f0f60f68d11c6040ad425b947
Author: Miklos Vajna 
Date:   Sun Sep 30 15:28:47 2012 +0200

sw: clean up one more test

Change-Id: Icfcdbedaf6b123fc726e2298ac47698940b36091

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 35a3e58..30e03ce 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -605,19 +605,12 @@ void Test::testFdo49501()
 
 uno::Reference 
xStyle(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY);
 
-sal_Bool bIsLandscape = sal_False;
-xStyle->getPropertyValue("IsLandscape") >>= bIsLandscape;
-CPPUNIT_ASSERT_EQUAL(sal_True, bIsLandscape);
+CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xStyle, 
"IsLandscape"));
 sal_Int32 nExpected(TWIP_TO_MM100(567));
-sal_Int32 nValue = 0;
-xStyle->getPropertyValue("LeftMargin") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
-xStyle->getPropertyValue("RightMargin") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
-xStyle->getPropertyValue("TopMargin") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
-xStyle->getPropertyValue("BottomMargin") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(nExpected, nValue);
+CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, 
"LeftMargin"));
+CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, 
"RightMargin"));
+CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, 
"TopMargin"));
+CPPUNIT_ASSERT_EQUAL(nExpected, getProperty(xStyle, 
"BottomMargin"));
 }
 
 void Test::testFdo49271()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

2012-09-30 Thread Libreoffice Gerrit user

 sw/qa/extras/rtfimport/rtfimport.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit f9453275d2710f9d3e9a4cc1285a57db334a5e2e
Author: Miklos Vajna 
Date:   Sun Sep 30 15:11:05 2012 +0200

sw: more testcase cleanup

Change-Id: I39681fbf57c828e5d6e80ae7c3155f2f60410a1a

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 5258522..35a3e58 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -575,14 +575,8 @@ void Test::testFdo47764()
 {
 load("fdo47764.rtf");
 
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
-uno::Reference xPropertySet(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-sal_Int32 nValue = 0;
 // \cbpat with zero argument should mean the auto (-1) color, not a 
default color (black)
-xPropertySet->getPropertyValue("ParaBackColor") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), 
getProperty(getParagraph(1), "ParaBackColor"));
 }
 
 void Test::testFdo38786()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

2012-09-30 Thread Libreoffice Gerrit user

 sw/qa/extras/rtfimport/rtfimport.cxx |   70 ++-
 1 file changed, 13 insertions(+), 57 deletions(-)

New commits:
commit 023ea2a73f17303fcc0895e807413b1e54ae7ec2
Author: Miklos Vajna 
Date:   Sun Sep 30 15:04:29 2012 +0200

sw: cleanup in rtfimport test

Change-Id: Idef3ee3fa246b314c4b6b8a59b2b366dadfb679a

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 96503a7..5258522 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -319,14 +319,8 @@ void Test::testN750757()
 uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
 uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
 
-uno::Reference xPropertySet(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-sal_Bool bValue;
-xPropertySet->getPropertyValue("ParaContextMargin") >>= bValue;
-CPPUNIT_ASSERT_EQUAL(sal_Bool(false), bValue);
-
-xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY);
-xPropertySet->getPropertyValue("ParaContextMargin") >>= bValue;
-CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue);
+CPPUNIT_ASSERT_EQUAL(sal_Bool(false), 
getProperty(xParaEnum->nextElement(), "ParaContextMargin"));
+CPPUNIT_ASSERT_EQUAL(sal_Bool(true), 
getProperty(xParaEnum->nextElement(), "ParaContextMargin"));
 }
 
 void Test::testFdo45563()
@@ -355,17 +349,11 @@ void Test::testFdo43965()
 uno::Reference 
xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
 uno::Reference xRangeEnum = 
xRangeEnumAccess->createEnumeration();
 uno::Reference 
xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY);
-sal_Int32 nValue;
-xPropertySet->getPropertyValue("CharEscapement") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(36), nValue);
-xPropertySet->getPropertyValue("CharEscapementHeight") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(100), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(36), getProperty(xPropertySet, 
"CharEscapement"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty(xPropertySet, 
"CharEscapementHeight"));
 
 // Second paragraph: Word vs Writer border default problem
-xPropertySet.set(xParaEnum->nextElement(), uno::UNO_QUERY);
-table::BorderLine2 aBorder;
-xPropertySet->getPropertyValue("TopBorder") >>= aBorder;
-CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), aBorder.LineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), 
getProperty(xParaEnum->nextElement(), 
"TopBorder").LineWidth);
 
 // Finally, make sure that we have two pages
 CPPUNIT_ASSERT_EQUAL(2, getPages());
@@ -378,10 +366,7 @@ void Test::testN751020()
 uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
 uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
 CPPUNIT_ASSERT(xParaEnum->hasMoreElements());
-uno::Reference xPropertySet(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-sal_Int32 nValue = 0;
-xPropertySet->getPropertyValue("ParaBottomMargin") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), nValue);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(200)), 
getProperty(xParaEnum->nextElement(), "ParaBottomMargin"));
 }
 
 void Test::testFdo47326()
@@ -400,10 +385,7 @@ void Test::testFdo47036()
 int nAtCharacter = 0;
 for (int i = 0; i < xDraws->getCount(); ++i)
 {
-uno::Reference 
xPropertySet(xDraws->getByIndex(i), uno::UNO_QUERY);
-text::TextContentAnchorType eValue;
-xPropertySet->getPropertyValue("AnchorType") >>= eValue;
-if (eValue == text::TextContentAnchorType_AT_CHARACTER)
+if (getProperty(xDraws->getByIndex(i), 
"AnchorType") == text::TextContentAnchorType_AT_CHARACTER)
 nAtCharacter++;
 }
 // The image at the document start was ignored.
@@ -427,12 +409,7 @@ void Test::testFdo46955()
 uno::Reference 
xRangeEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
 uno::Reference xRangeEnum = 
xRangeEnumAccess->createEnumeration();
 while (xRangeEnum->hasMoreElements())
-{
-uno::Reference 
xPropertySet(xRangeEnum->nextElement(), uno::UNO_QUERY);
-sal_Int16 nValue;
-xPropertySet->getPropertyValue("CharCaseMap") >>= nValue;
-CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, nValue);
-}
+CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, 
getProperty(xRangeEnum->nextElement(), "CharCaseMap"));
 }
 }
 
@@ -440,8 +417,7 @@ void Test::testFdo45394()
 {
 load("fdo45394.rtf");
 
-uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName("Default"), uno::UNO_QUERY);
-uno::Reference 
xHeaderText(xPropertySet->getPropertyValue("HeaderText"), uno::UNO_QUERY);
+uno::Reference xHeaderText = getProperty< 
uno::Reference >(getStyles("PageStyles")->getByName("Default"), 
"HeaderText");
 OUString aActual = xHeaderText->getString();
 // Encoding in the header was wrong.

[PATCH] Change in core[feature/killsdf]: Use ascii charachters to seperate qtzi

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/731

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/731/1

Use ascii charachters to seperate qtzi

Because previous used charachters cause warnings

Change-Id: I8715fc2a05df9d84b34945618184c99d54de6579
---
M l10ntools/source/merge.cxx
1 file changed, 2 insertions(+), 2 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/731
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8715fc2a05df9d84b34945618184c99d54de6579
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Module_cross_tail_build.mk

2012-09-30 Thread Libreoffice Gerrit user

 Module_cross_tail_build.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit 037ff8fac75db980a3bc44092df243aadaad3d38
Author: David Tardon 
Date:   Sun Sep 30 13:21:35 2012 +0200

gettext depends on sal...

Change-Id: Iec26cfb2f6715b12bed290d72e3a013d6a980544

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index e15848b..429891b 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -73,7 +73,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
remotebridges \
ridljar \
rsc \
-   sal \
salhelper \
sax \
shell \
@@ -93,9 +92,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
unotest \
unotools \
ure \
-   $(if $(filter NATIVE,$(BUILD_TYPE)),\
-   xml2cmp \
-   ) \
xmlhelp \
xmlreader \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[feature/killsdf]: Make error message clearer in localize

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/730

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/730/1

Make error message clearer in localize

which is written out when one of executables
writes out invalid sdf line

Change-Id: I167b31bf0f550222accdda8ee5a03d8e4a742d63
---
M l10ntools/source/localize.cxx
1 file changed, 5 insertions(+), 1 deletion(-)


--
To view, visit https://gerrit.libreoffice.org/730
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I167b31bf0f550222accdda8ee5a03d8e4a742d63
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[feature/killsdf]: Move setting of po msgid to constructor

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/729

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/729/1

Move setting of po msgid to constructor

because this is part of initialization

Change-Id: If6ebe46cea93e378c9060f2c3ced09ab44a3d82a
---
M l10ntools/source/po.cxx
1 file changed, 3 insertions(+), 9 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/729
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6ebe46cea93e378c9060f2c3ced09ab44a3d82a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[feature/killsdf]: Make Po classes robuster

2012-09-30 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/728

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/728/1

Make Po classes robuster

-Make PoOfstream\PoIfstream classes for
checked po input\output
-Make copyability obvious
-Handle runtime errors with exceptions
-Use assertions to define exceptations
for programmers
Plus some correction
-Use simplier indentation
-In renewpo.cxx, define sdf file as a tempfile
instead of make it in current location
-Use constructor to renew poheader
-Use const where needed

Change-Id: Ic11ce3b9eee9a9fa9fbc4ccda154623160ad9d8a
---
M l10ntools/inc/po.hxx
M l10ntools/source/localize.cxx
M l10ntools/source/merge.cxx
M l10ntools/source/po.cxx
M l10ntools/source/renewpo.cxx
5 files changed, 426 insertions(+), 132 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/728
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic11ce3b9eee9a9fa9fbc4ccda154623160ad9d8a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

51 matches

Mail list logo