Re: Direct csv import into Base table

[Zolnai Tamás]

2013/6/3 Dan Lewis elderdanle...@gmail.com

 On 06/03/2013 06:05 AM, Zolnai Tamás wrote:

 Hi Lionel,

I'm working on a new feature in Base again. It's just a little user
 helper feature to make available the direct import of an csv file into
 table, without open Calc and copypaste the content from it to Base. I
 already have the plan to implement it and it seems to me that it will work
 not just with csv files but all Calc compatible format (in this case only
 the first sheet will be imported, but later it can be extended). I will use
 up the code which lies under the OLE-object feature of Writer, which
 already contains the csv import.
The only question is where this feature would be reachable. I have two
 ideas and I think all of these two places should be used:
1. Table view - Tasks. Add a 4th option like Import Table From
 File This point contains all other places which are almost the
 duplicates of this Tables list (e.g. Insert menu with label Table
 (Import)... ).
2. Table view - Tables - context menu. The label can be Import
 Table

 If you agree with these points than I send a mail to the ux mailing list
 for a new icon which can be displayed in the Tasks list and in the menu.

 Best Regards,
 Tamás

   Pardon me for making a comment. Base can connect to a CSV file now
 using the Base wizard. It seems like what you want to do could be made part
 of this wizard. At least this makes more sense to me since it is creating
 or modifying a database.


Yes, it might be the way. But I don't see where this wizard modifying a
database. I see only opening, creating and connecting functionalities, but
nothing about modifying. What you mean under modifying?


Best Regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: dbaccess/source

[Zolnai Tamás]

 dbaccess/source/ui/dlg/dbwizsetup.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7eac30949936fb22648d6c8eda78f80418a3cf3e
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Fri May 31 18:19:29 2013 +0200

dbaccess: unused variable

Change-Id: I4bd8863bac0f5b4a5ff1936a9d6a240dbc40be72

diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 2679257..e14fedf 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -1073,7 +1073,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
 if ( !OWizardMachine::Finnish( RET_CANCEL ) )
 return sal_False;
 
-Reference XComponentLoader  xFrameLoader;
 try
 {
 AsyncLoader* pAsyncLoader = new AsyncLoader( getORB(), 
m_pGeneralPage-GetSelectedDocument().sURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Character border

[Zolnai Tamás]

Hi Cedric,

Well that is only the use case and it isn't that complex: if we can draw
 the 4 borders, then any other case is pretty simple ;)


Yes, I just add the use case, so all of us can got ideas about it without
having an intense knowledge about the implementation. And yes I hope so
that will simple.


 You should better see your task as the following steps:
   * Change the Character properties UI to add the existing Borders
 page.
   * Write the borders definition into the SwFmt.
   * Change the layout to paint the borders. Borders will influence the
 line height and spacing between characters. This part will probably be
 the trickiest one. The code to paint borders is already implemented, but
 changing the layout requires you to understand it first ;)
   * Persist the borders to the various filters. There is no
 specification to do here as even ODF specifies these borders.


 Thanks for the advices.

I think Miklos planned to have a kick-starting session with you: we'll
 be able to discuss the details there. I once had a patch for the first
 step, you'll find it attached, although I'm not sure it's still useful.


 Yes, I've already spoken with Miklos, but as I said, I wait ideas from
anybody, not just from the proficients, but of course the latters will be
the most helpfull for the implementation.

Best regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSoC] Character border

[Zolnai Tamás]

Hi all,

   It seems my proposal got into the selected ones, thanks for the
opportunity.

As some of list members know I am not a beginner with LO. I have
already done some work mostly with localization (kill sdf and
refactor\clean l10ntools). Additionally I have added a little feature which
is visible from the side of the users too (limitbox in Base).

On the summer, I will wrok with Writer, making possible using character
borders. It sounds simple, but it has more sides. The first thing that
comes to mind about character border is a simple four-sided border with the
given color, width and style.
   But It can be extended a bit, with adding different borders to the sides
or adding borders just to the selected ones (like table border). So it can
use no just as a border but as an underlining or overlining (with more
features which a simple one provide) but in extreme cases it can also use
as an unremoveable '|' separator. (well, I have no idea when it comes in
handy)
   The third part is using shadow as a special inhomogeneous border and
adding padding between the selected characters and the border.

   I added a bit detailed description of this feature, just to see what
territories it touch. So if anybody has ideas\advices about painting
lines\borders, adding new character attributes, extending filters or
anything linked with them, than - as the phrase goes - feel free to write
me.


Best regards,
Tamas
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

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

New commits:
commit 1cb50dc6ec75586975c2d4e528953fa8ca33e1f1
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sun May 26 08:30:22 2013 +0200

Escape quotes during stringex export

Change-Id: If53afd3743f44bcfffab33122657d14c0f4aba1e

diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 34c978b..9e3fa7a 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -71,7 +71,7 @@ void StringParser::Extract( const OString rPOFile )
 xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)(name));
 xmlChar* pText = xmlNodeGetContent(pCurrent);
 const OString sTemp =
-helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t,\n\t);
+helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t\\',\n\t\\');
 common::writePoEntry(
 Stringex, aPOStream, m_pSource-name, string,
 helper::xmlStrToOString( pID ), OString(), OString(),
@@ -130,7 +130,7 @@ void StringParser::Merge(
 {
 xmlChar* pText = xmlNodeGetContent(pCurrent);
 const OString sOriginText =
-helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t,\n\t);
+helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t\\',\n\t\\');
 xmlFree( pText );
 sNewText = MergeEntrys::GetQTZText(aResData, sOriginText);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - l10ntools/source

[Zolnai Tamás]

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

New commits:
commit a3eca34a471e4111877bb35170f90f20463a02c3
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sun May 26 08:30:22 2013 +0200

Escape quotes during stringex export

Change-Id: If53afd3743f44bcfffab33122657d14c0f4aba1e

diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 34c978b..9e3fa7a 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -71,7 +71,7 @@ void StringParser::Extract( const OString rPOFile )
 xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)(name));
 xmlChar* pText = xmlNodeGetContent(pCurrent);
 const OString sTemp =
-helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t,\n\t);
+helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t\\',\n\t\\');
 common::writePoEntry(
 Stringex, aPOStream, m_pSource-name, string,
 helper::xmlStrToOString( pID ), OString(), OString(),
@@ -130,7 +130,7 @@ void StringParser::Merge(
 {
 xmlChar* pText = xmlNodeGetContent(pCurrent);
 const OString sOriginText =
-helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t,\n\t);
+helper::unEscapeAll(helper::xmlStrToOString( pText 
),\\n\\t\\',\n\t\\');
 xmlFree( pText );
 sNewText = MergeEntrys::GetQTZText(aResData, sOriginText);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/export.cxx |2 +-
 l10ntools/source/helper.cxx |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f21a2374dc623604d26cec5ec3d5a8f7a8958b63
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat May 25 22:23:57 2013 +0200

Fix some escaping bug in l10ntools

1. A typo in export.cxx makes not working replacing
2. EscapeAll() ignored single backlash characters

Change-Id: I1a5309778acdd601391f643ebf3c66d04a6601d4

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5d285ad..c15d81f 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1201,7 +1201,7 @@ void Export::ConvertMergeContent( OString rText )
 sal_Bool bNoClose = !rText.endsWith(\\\);
 
 
-rText = rText.replaceAll(\\\',\'); // Temporary: until PO files 
contain escaped single quotes
+rText = rText.replaceAll(\\\',\'); // Temporary: until PO files 
contain escaped single quotes
 // (Maybe next PO update solve 
this)
 rText =
 helper::escapeAll(
diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx
index 6c3a0455..85bfe4a 100644
--- a/l10ntools/source/helper.cxx
+++ b/l10ntools/source/helper.cxx
@@ -46,6 +46,10 @@ OString unEscapeAll(
 sReturn.append(rUnEscaped[nEscapedOne/2]);
 ++nIndex;
 }
+else
+{
+sReturn.append(rText[nIndex]);
+}
 }
 else
 sReturn.append(rText[nIndex]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - l10ntools/source

[Zolnai Tamás]

 l10ntools/source/export.cxx |2 +-
 l10ntools/source/helper.cxx |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4e41e4aaa39e78102e989146c24154a85a08a59b
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat May 25 22:23:57 2013 +0200

Fix some escaping bug in l10ntools

1. A typo in export.cxx makes not working replacing
2. EscapeAll() ignored single backlash characters

Change-Id: I1a5309778acdd601391f643ebf3c66d04a6601d4

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 5d285ad..c15d81f 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1201,7 +1201,7 @@ void Export::ConvertMergeContent( OString rText )
 sal_Bool bNoClose = !rText.endsWith(\\\);
 
 
-rText = rText.replaceAll(\\\',\'); // Temporary: until PO files 
contain escaped single quotes
+rText = rText.replaceAll(\\\',\'); // Temporary: until PO files 
contain escaped single quotes
 // (Maybe next PO update solve 
this)
 rText =
 helper::escapeAll(
diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx
index 6c3a0455..85bfe4a 100644
--- a/l10ntools/source/helper.cxx
+++ b/l10ntools/source/helper.cxx
@@ -46,6 +46,10 @@ OString unEscapeAll(
 sReturn.append(rUnEscaped[nEscapedOne/2]);
 ++nIndex;
 }
+else
+{
+sReturn.append(rText[nIndex]);
+}
 }
 else
 sReturn.append(rText[nIndex]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source solenv/gbuild

[Zolnai Tamás]

 l10ntools/inc/export.hxx   |   64 -
 l10ntools/source/cfgmerge.cxx  |   15 -
 l10ntools/source/export.cxx|  496 ++---
 l10ntools/source/helpmerge.cxx |   15 -
 l10ntools/source/merge.cxx |   84 +-
 l10ntools/source/xrmmerge.cxx  |   14 -
 solenv/gbuild/HelpTarget.mk|2 
 7 files changed, 267 insertions(+), 423 deletions(-)

New commits:
commit c7ef2522272579a12eecddded0cbed6d222d3742
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu May 2 12:09:35 2013 +0200

Make localization a bit more effective

1. get rid of some unefficiency
The old executables used to parse items which has
other language than en-US. To this items executables
search MergeEntrys(read from po) and change the content if
possible. This mixed localization method not need any longer.
-cfgex: cfgmerge:WorkOnText()
-xrmex: xrmmerge:WorkOnText()
-transex3: export:PrepareTextToMerge()

2. Change the container of MergeData to get a bit efficiency.
The new MergeDataHashMap is exploit that in most case the
insertion and search happen in the same order.(similar to fifo)
So add an iterator-chain to define an insertion order in the
original hashmap.
Every call of find it is a hint that the next element, to
the last found one, is the searched one. If not than search
such like in a HasMap.

3. Set up some order in helpex
Helpex is the only one, which was not used to merge strings
in the same order as export, so change it to work effective
with the new HashMap.
Helpex works with all file of a specific directory and po
files contain the strings of these files in lexical order
 so use the same order for merge.(HelpTarget.mk)

4. Make export use MergeDataHashMap a bit more effective
-The same MergeData contains strings to all language,
so it need to get only once.
-Just text entrys have MergeData, others not need to
search for it. (e.g. bitmap)

Plus delete some unused code.

Change-Id: I6ec80cd2323ffea8f783d0b59dc89ca7eac3c205

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 7a6f911..a7f8ea1 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -52,9 +52,6 @@ typedef boost::unordered_mapOString, OString, OStringHash
 typedef boost::unordered_mapOString, bool, OStringHash
 OStringBoolHashMap;
 
-typedef boost::unordered_mapOString, MergeData*, OStringHash
-MergeDataHashMap;
-
 #define SOURCE_LANGUAGE en-US
 #define X_COMMENT x-comment
 #define LIST_REFID  LIST_REFID
@@ -193,7 +190,6 @@ private:
 bool bSkipFile;
 sal_Bool bMergeMode;
 OString sMergeSrc;
-OString sLastListLine;
 sal_Bool bError;// any errors while export?
 sal_Bool bReadOver;
 sal_Bool bDontWriteOutput;
@@ -219,8 +215,12 @@ private:
 void CleanValue( OString rValue );
 OString GetText(const OString rSource, int nToken);
 
-sal_Bool PrepareTextToMerge(OString rText, sal_uInt16 nTyp,
-OString rLangIndex, ResData *pResData);
+/**
+  Get all MergeEntrys for the ExportList identified by pResData
+  Check whether list can merge and load all needed MergeEntry from 
DataBase.
+*/
+bool GetAllMergeEntrysOfList(ResData *pResData, std::vectorMergeEntrys* 
o_vMergeEntrys, ExportList* o_pList);
+
 void ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString 
rTextType );
 void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
 void ConvertMergeContent( OString rText );
@@ -277,10 +277,56 @@ public:
 bTitleFirst[ rId ] = true;
 }
 sal_Bool GetText( OString rReturn, sal_uInt16 nTyp, const OString 
nLangIndex, sal_Bool bDel = sal_False );
+
+/**
+  Generate QTZ string with ResData
+  For executable which works one language and without PO files.
+*/
 static OString GetQTZText(const ResData rResData, const OString 
rOrigText);
 
 };
 
+/** Container for MergeData
+
+  This class is an HashMap with a hidden insertion
+  order. The class can used just like a simple
+  HashMap, but good to know that it's use is
+  more effective if the accessing(find) order
+  match with the insertion order.
+
+  In the most case, this match is good.
+  (e.g. reading PO files of different languages,
+  executables merging)
+*/
+class MergeDataHashMap
+{
+private:
+typedef boost::unordered_mapOString, MergeData*, OStringHash 
HashMap_t;
+
+public:
+MergeDataHashMap():bFirstSearch(true){};
+~MergeDataHashMap(){};
+
+typedef HashMap_t::iterator iterator;
+typedef HashMap_t::const_iterator const_iterator;
+
+std::pairiterator,bool insert(const OString rKey, MergeData* 
pMergeData);
+iterator find(const OString rKey);
+
+iterator begin() {return m_aHashMap.begin();}
+iterator end() {return m_aHashMap.end();}
+
+

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/cfgmerge.hxx |   19 ++
 l10ntools/inc/common.hxx   |7 ++--
 l10ntools/inc/export.hxx   |   70 
 l10ntools/inc/helper.hxx   |9 -
 l10ntools/inc/lngmerge.hxx |   14 ++--
 l10ntools/inc/po.hxx   |   10 ++---
 l10ntools/inc/propmerge.hxx|   10 +++--
 l10ntools/inc/treemerge.hxx|   18 ++
 l10ntools/inc/xmlparse.hxx |   25 ++
 l10ntools/inc/xrmmerge.hxx |   17 -
 l10ntools/source/cfgmerge.cxx  |   30 ++---
 l10ntools/source/export.cxx|   39 --
 l10ntools/source/merge.cxx |   10 ++---
 l10ntools/source/po.cxx|   69 ---
 l10ntools/source/treemerge.cxx |   15 +++-
 l10ntools/source/xrmmerge.cxx  |   71 +
 16 files changed, 151 insertions(+), 282 deletions(-)

New commits:
commit 29400c568a84339066ef238e836cfeb19f732873
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu May 2 15:06:23 2013 +0200

Some code scrubing

Add doxygen documentation for classes and methods
Delete useless comments.
Add include guards where missing.
Delete some useless typedef.

Change-Id: I9bba16560790239d7775fcd40981465e70e5d437

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 9710008..03addd1 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -64,12 +64,10 @@ public:
 // class CfgStack
 //
 
-typedef std::vector CfgStackData*  CfgStackList;
-
 class CfgStack
 {
 private:
-CfgStackList maList;
+std::vector CfgStackData*  maList;
 
 public:
 CfgStack() {}
@@ -92,10 +90,7 @@ public:
 size_t size() const { return maList.size(); }
 };
 
-//
-// class CfgParser
-//
-
+/// Parser for *.xcu files
 class CfgParser
 {
 protected:
@@ -136,10 +131,7 @@ public:
 int Execute( int nToken, char * pToken );
 };
 
-//
-// class CfgExport
-//
-
+/// Export strings from *.xcu files
 class CfgExport : public CfgParser
 {
 private:
@@ -162,10 +154,7 @@ public:
 ~CfgExport();
 };
 
-//
-// class CfgMerge
-//
-
+/// Merge strings to *.xcu files
 class CfgMerge : public CfgParser
 {
 private:
diff --git a/l10ntools/inc/common.hxx b/l10ntools/inc/common.hxx
index 93f2d00..5a12bbb 100644
--- a/l10ntools/inc/common.hxx
+++ b/l10ntools/inc/common.hxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/// Methods used by all of executables
+// Methods used by all of executables
 
 #ifndef INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
 #define INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
@@ -20,7 +20,7 @@
 
 namespace common {
 
-//result type of handleArguments()
+/// Result type of handleArguments()
 struct HandledArgs
 {
 OString m_sInputFile;
@@ -37,10 +37,13 @@ struct HandledArgs
 {}
 };
 
+/// Handle command line parameters
 bool handleArguments(int argc, char * argv[], HandledArgs o_aHandledArgs);
 
+/// Write out a help about usage
 void writeUsage(const OString rName, const OString rFileType);
 
+/// Write out a PoEntry with attention to excaptions
 void writePoEntry(
 const OString rExecutable, PoOfstream rPoStream, const OString 
rSourceFile,
 const OString rResType, const OString rGroupId, const OString rLocalId,
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a7f8ea1..d23cc6f 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -30,9 +30,9 @@
 #include osl/file.h
 
 #include boost/unordered_map.hpp
-#include iterator /* std::iterator*/
-#include set  /* std::set*/
-#include vector   /* std::vector*/
+#include iterator
+#include set
+#include vector
 #include queue
 #include string
 
@@ -44,7 +44,6 @@
 #define NO_TRANSLATE_ISOx-no-translate
 
 class MergeEntrys;
-class MergeData;
 
 typedef boost::unordered_mapOString, OString, OStringHash
 OStringHashMap;
@@ -56,17 +55,18 @@ typedef boost::unordered_mapOString, bool, OStringHash
 #define X_COMMENT x-comment
 #define LIST_REFID  LIST_REFID
 
-typedef OStringHashMap ExportListEntry;
-typedef ::std::vector ExportListEntry*  ExportListBase;
-
 //
 // class ExportList
 //
 
+typedef OStringHashMap ExportListEntry;
+
+
+/// Container for parse different types of string lists
 class ExportList
 {
 private:
-ExportListBase maList;
+std::vector ExportListEntry*  maList;
 std::size_t nSourceLanguageListEntryCount;
 
 public:
@@ -85,13 +85,9 @@ public:
 #define REFID_NONE 0x
 
 //
-// struct ResData
+// class ResData
 //
 
-/**
-* Purpose: holds mandatory data to export a single res (used with ResStack)
-**/
-
 #define ID_LEVEL_NULL   0x
 #define ID_LEVEL_AUTOID 0x0001
 #define ID_LEVEL_TEXT   0x0002
@@ -100,6 +96,8 @@ public:
 #define ID_LEVEL_IDENTIFIER 

[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen

[Zolnai Tamás]

 dev/null  |binary
 icon-themes/crystal/cmd/lc_dbquerypropertiesdialog.png|binary
 icon-themes/crystal/cmd/sc_dbquerypropertiesdialog.png|binary
 icon-themes/galaxy/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/galaxy/cmd/sc_dbquerypropertiesdialog.png |binary
 icon-themes/hicontrast/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/hicontrast/cmd/sc_dbquerypropertiesdialog.png |binary
 icon-themes/human/cmd/lc_dbquerypropertiesdialog.png  |binary
 icon-themes/human/cmd/sc_dbquerypropertiesdialog.png  |binary
 icon-themes/industrial/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/industrial/cmd/sc_dbquerypropertiesdialog.png |binary
 icon-themes/oxygen/cmd/lc_dbquerypropertiesdialog.png |binary
 icon-themes/oxygen/cmd/sc_dbquerypropertiesdialog.png |binary
 13 files changed

New commits:
commit 24500d6798007d84521eb24a81c121ebe69d3bfd
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Wed Apr 24 00:22:37 2013 +0200

Rename image files to match with command name

Change-Id: I5e7bf2ecb0d194420b694861187bab23d1bbef3c

diff --git a/icon-themes/crystal/cmd/lc_dbqueryproperties.png 
b/icon-themes/crystal/cmd/lc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/crystal/cmd/lc_dbqueryproperties.png
rename to icon-themes/crystal/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/crystal/cmd/sc_dbqueryproperties.png 
b/icon-themes/crystal/cmd/sc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/crystal/cmd/sc_dbqueryproperties.png
rename to icon-themes/crystal/cmd/sc_dbquerypropertiesdialog.png
diff --git a/icon-themes/galaxy/cmd/lc_dbqueryproperties.png 
b/icon-themes/galaxy/cmd/lc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/galaxy/cmd/lc_dbqueryproperties.png
rename to icon-themes/galaxy/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/galaxy/cmd/sc_dbqueryproperties.png 
b/icon-themes/galaxy/cmd/sc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/galaxy/cmd/sc_dbqueryproperties.png
rename to icon-themes/galaxy/cmd/sc_dbquerypropertiesdialog.png
diff --git a/icon-themes/hicontrast/cmd/lc_dbqueryproperties.png 
b/icon-themes/hicontrast/cmd/lc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/hicontrast/cmd/lc_dbqueryproperties.png
rename to icon-themes/hicontrast/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/hicontrast/cmd/sc_dbqueryproperties.png 
b/icon-themes/hicontrast/cmd/sc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/hicontrast/cmd/sc_dbqueryproperties.png
rename to icon-themes/hicontrast/cmd/sc_dbquerypropertiesdialog.png
diff --git a/icon-themes/human/cmd/lc_dbqueryproperties.png 
b/icon-themes/human/cmd/lc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/human/cmd/lc_dbqueryproperties.png
rename to icon-themes/human/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/human/cmd/sc_dbqueryproperties.png 
b/icon-themes/human/cmd/sc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/human/cmd/sc_dbqueryproperties.png
rename to icon-themes/human/cmd/sc_dbquerypropertiesdialog.png
diff --git a/icon-themes/industrial/cmd/lc_dbqueryproperties.png 
b/icon-themes/industrial/cmd/lc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/industrial/cmd/lc_dbqueryproperties.png
rename to icon-themes/industrial/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/industrial/cmd/sc_dbqueryproperties.png 
b/icon-themes/industrial/cmd/sc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/industrial/cmd/sc_dbqueryproperties.png
rename to icon-themes/industrial/cmd/sc_dbquerypropertiesdialog.png
diff --git a/icon-themes/oxygen/cmd/lc_dbqueryproperties.png 
b/icon-themes/oxygen/cmd/lc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/oxygen/cmd/lc_dbqueryproperties.png
rename to icon-themes/oxygen/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/oxygen/cmd/sc_dbqueryproperties.png 
b/icon-themes/oxygen/cmd/sc_dbquerypropertiesdialog.png
similarity index 100%
rename from icon-themes/oxygen/cmd/sc_dbqueryproperties.png
rename to icon-themes/oxygen/cmd/sc_dbquerypropertiesdialog.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/sdremote l10ntools/inc l10ntools/source librelogo/CustomTarget_librelogo.mk solenv/gbuild

[Zolnai Tamás]

 android/sdremote/Makefile   |8 ++-
 l10ntools/inc/export.hxx|1 
 l10ntools/inc/helpmerge.hxx |6 +-
 l10ntools/inc/po.hxx|1 
 l10ntools/source/common.cxx |2 
 l10ntools/source/helpex.cxx |   22 ++--
 l10ntools/source/helpmerge.cxx  |   83 +
 l10ntools/source/merge.cxx  |   33 +
 l10ntools/source/po.cxx |   89 
 l10ntools/source/propmerge.cxx  |   46 --
 l10ntools/source/stringmerge.cxx|   56 +-
 l10ntools/source/treemerge.cxx  |   51 
 librelogo/CustomTarget_librelogo.mk |   27 +++---
 solenv/gbuild/Dictionary.mk |   26 ++
 solenv/gbuild/ExtensionTarget.mk|   88 ++-
 solenv/gbuild/HelpTarget.mk |   54 ++---
 16 files changed, 356 insertions(+), 237 deletions(-)

New commits:
commit 36b3bcefcf13996610239f95b1dce9f291bde95d
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 20 09:20:31 2013 +0200

Some changes in qtz handling

Executalbes, which work one language, generat qtz by own.
(stringex,helpex,treex,propex)
So these executables can generate qtz without po file
when use them with qtz, call them with -m flag without parameter.

Change-Id: I56c34db7151dc3ef0ce1c85ed607719e4cbb5e92

diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index b8ea1e9..26acfd8 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -36,8 +36,10 @@ endef
 define android_translation_rules
 $(call android_get_po,$(1)):
mkdir -p res/values-$(1)
-   echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po 
 translations-$(1).db
-   $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
+   $(if $(filter-out qtz,$(1)), \
+   echo 
$(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po  
translations-$(1).db \
+   $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1), \
+   $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m -l $(1))
 
 endef
 
@@ -46,7 +48,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
 endef
 
 define android_get_langlist
-$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo qtz nso 
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso 
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
 endef
 
 $(eval $(call android_translations_rules,$(call android_get_langlist)))
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 2230569..a1a2e8c 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -281,6 +281,7 @@ public:
 bTitleFirst[ rId ] = true;
 }
 sal_Bool GetText( OString rReturn, sal_uInt16 nTyp, const OString 
nLangIndex, sal_Bool bDel = sal_False );
+static OString GetQTZText(const ResData rResData, const OString 
rOrigText);
 
 };
 
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 1f9c90a..42b2401 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -49,12 +49,12 @@ public:
 /// Method merges the String from the POfile into XMLfile. Both Strings must
 /// point to existing files.
 bool Merge( const OString rPOFile_in, const OString rDestinationFile_in ,
-const OString sLanguage , MergeDataFile aMergeDataFile );
+const OString sLanguage , MergeDataFile* pMergeDataFile );
 
 private:
-bool MergeSingleFile( XMLFile* file , MergeDataFile aMergeDataFile , 
const OString sLanguage , OString const  sPath );
+bool MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile , 
const OString sLanguage , OString const  sPath );
 
-void ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResData 
*pResData , MergeDataFile aMergeDataFile );
+void ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResData 
*pResData , MergeDataFile* pMergeDataFile );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 26bbedf..603727d 100755
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -63,6 +63,7 @@ public:
 OString getKeyId() const;
 
 static bool IsInSameComp(const PoEntry rPo1,const PoEntry rPo2);
+static OString  genKeyId(const OString rGenerator);
 
 };
 
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index 304f44c..b143a7c 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -37,6 +37,7 @@ bool handleArguments(
 else if ( OString( argv[ i ] ).toAsciiUpperCase() == -M )
 {
   

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/export.hxx   |5 -
 l10ntools/source/merge.cxx |8 
 2 files changed, 13 deletions(-)

New commits:
commit 2d8e4f91feeba58dbe4dc38e484a3be0f578ae9f
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sun Apr 21 19:09:27 2013 +0200

Delete more unused member from export

Change-Id: Icebd32c7ac2144f99827ca48cca7bbcaf10814c4

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a1a2e8c..7a6f911 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -128,16 +128,12 @@ public:
 OString sFilename;
 
 OStringHashMap sText;
-sal_uInt16 nTextRefId;
 
 OStringHashMap sHelpText;
-sal_uInt16 nHelpTextRefId;
 
 OStringHashMap sQuickHelpText;
-sal_uInt16 nQuickHelpTextRefId;
 
 OStringHashMap sTitle;
-sal_uInt16 nTitleRefId;
 
 OString sTextTyp;
 
@@ -322,7 +318,6 @@ public:
 class MergeDataFile
 {
 private:
-OString sErrorLog;
 MergeDataHashMap aMap;
 std::setOString aLanguageSet;
 
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 401cba5..498962f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -74,10 +74,6 @@ ResData::ResData( const OString rGId )
 bTitle( sal_False ),
 bList( sal_False ),
 sGId( rGId ),
-nTextRefId( REFID_NONE ),
-nHelpTextRefId( REFID_NONE ),
-nQuickHelpTextRefId( REFID_NONE ),
-nTitleRefId( REFID_NONE ),
 sTextTyp( Text ),
 pStringList( NULL ),
 pUIEntries( NULL ),
@@ -100,10 +96,6 @@ ResData::ResData( const OString rGId, const OString 
rFilename)
 bList( sal_False ),
 sGId( rGId ),
 sFilename( rFilename ),
-nTextRefId( REFID_NONE ),
-nHelpTextRefId( REFID_NONE ),
-nQuickHelpTextRefId( REFID_NONE ),
-nTitleRefId( REFID_NONE ),
 sTextTyp( Text ),
 pStringList( NULL ),
 pUIEntries( NULL ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/export.hxx|4 
 l10ntools/source/export.cxx |   17 -
 l10ntools/source/merge.cxx  |6 --
 3 files changed, 27 deletions(-)

New commits:
commit 9e2d2822063729f450adb734f58106bb64695ce6
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 20 09:36:16 2013 +0200

Delete some unneeded member of ResData

nChildIndex and bRestMerges are simple unused.
nWidth is an obsolote attribute

Change-Id: I669a17cefb3dc8628ce2c8d9db8abac630fc3cde

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 35f9772..2230569 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -111,8 +111,6 @@ public:
 ~ResData();
 sal_Bool SetId(const OString rId, sal_uInt16 nLevel);
 
-sal_Int32 nWidth;
-sal_uInt16 nChildIndex;
 sal_uInt16 nIdLevel;
 sal_Bool bChild;
 sal_Bool bChildWithText;
@@ -123,8 +121,6 @@ public:
 sal_Bool bTitle;
 sal_Bool bList;
 
-sal_Bool bRestMerged;
-
 OString sResTyp;
 OString sId;
 OString sGId;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index bf1fbce..af97a4b 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -782,23 +782,6 @@ int Export::Execute( int nToken, const char * pToken )
 case APPFONTMAPPING:
 {
 bDontWriteOutput = sal_False;
-// this is a AppfontMapping, so look if its a definition
-// of field size
-sal_Int32 n = 0;
-OString sKey(
-sToken.getToken(0, '=', n).replaceAll( , OString()).
-replaceAll(\t, OString()));
-OString sMapping = sToken.getToken(0, '=', n);
-sMapping = sMapping.getToken(1, '(');
-sMapping = sMapping.getToken(0, ')').
-replaceAll(OString(' '), OString()).
-replaceAll(OString('\t'), OString()).
-toAsciiUpperCase();
-if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM(SIZE))) {
-pResData-nWidth = sMapping.getToken(0, ',').toInt32();
-} else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM(POSSIZE))) {
-pResData-nWidth = sMapping.getToken(2, ',').toInt32();
-}
 }
 break;
 case RSCDEFINELEND:
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index f1b283f..1555adb 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -65,8 +65,6 @@ namespace
 
 ResData::ResData( const OString rGId )
 :
-nWidth( 0 ),
-nChildIndex( 0 ),
 nIdLevel( ID_LEVEL_NULL ),
 bChild( sal_False ),
 bChildWithText( sal_False ),
@@ -75,7 +73,6 @@ ResData::ResData( const OString rGId )
 bQuickHelpText( sal_False ),
 bTitle( sal_False ),
 bList( sal_False ),
-bRestMerged( sal_False ),
 sGId( rGId ),
 nTextRefId( REFID_NONE ),
 nHelpTextRefId( REFID_NONE ),
@@ -93,8 +90,6 @@ ResData::ResData( const OString rGId )
 
 ResData::ResData( const OString rGId, const OString rFilename)
 :
-nWidth( 0 ),
-nChildIndex( 0 ),
 nIdLevel( ID_LEVEL_NULL ),
 bChild( sal_False ),
 bChildWithText( sal_False ),
@@ -103,7 +98,6 @@ ResData::ResData( const OString rGId, const OString 
rFilename)
 bQuickHelpText( sal_False ),
 bTitle( sal_False ),
 bList( sal_False ),
-bRestMerged( sal_False ),
 sGId( rGId ),
 sFilename( rFilename ),
 nTextRefId( REFID_NONE ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/export.hxx|3 --
 l10ntools/source/export.cxx |   49 +---
 2 files changed, 2 insertions(+), 50 deletions(-)

New commits:
commit 10e3c7c428a7d231055d643e12f454c4267deab2
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Mon Apr 15 17:58:24 2013 +0200

Delete remaind code of an obsolote parameter

Past: Use -l en-US, af, hu... parameter for transex
and to work with this string use InitLanguages() function.
Now: Use -l all parameter and get langauges from po files.
So InitLanguages is unneeded.

Change-Id: Ide6b3d24fb8b483c0c31034b1ffd6aba31c5e4c9

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 719102d..35f9772 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -206,7 +206,6 @@ private:
 sal_Bool bReadOver;
 sal_Bool bDontWriteOutput;
 OString sLastTextTyp;
-bool isInitialized;
 OString sFilename;
 OString sLanguages;
 
@@ -238,8 +237,6 @@ private:
 void WriteToMerged(const OString rText , bool bSDFContent);
 void SetChildWithText();
 
-void InitLanguages( bool bMergeMode = false );
-
 void CutComment( OString rText );
 
 public:
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 6a93531..bf1fbce 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -189,12 +189,10 @@ Export::Export(const OString rOutput)
 bError( sal_False ),
 bReadOver( sal_False ),
 bDontWriteOutput( sal_False ),
-isInitialized( false ),
 sFilename( global::inputPathname ),
 sLanguages( OString() ),
 pParseQueue( new ParserQueue( *this ) )
 {
-// open output stream
 aOutput.mPo = new PoOfstream( rOutput, PoOfstream::APP );
 if (!aOutput.mPo-isOpen()) {
 fprintf(stderr, ERROR : Can't open file %s\n, rOutput.getStr());
@@ -218,15 +216,10 @@ Export::Export(
 bError( sal_False ),
 bReadOver( sal_False ),
 bDontWriteOutput( sal_False ),
-isInitialized( false ),
 sFilename( global::inputPathname ),
 sLanguages( rLanguage ),
 pParseQueue( new ParserQueue( *this ) )
 {
-InitLanguages( bMergeMode );
-// used when merge is enabled
-
-// open output stream
 aOutput.mSimple = new std::ofstream();
 aOutput.mSimple-open(rOutput.getStr(), std::ios_base::out | 
std::ios_base::trunc);
 }
@@ -1442,15 +1435,7 @@ sal_Bool Export::PrepareTextToMerge(OString rText, 
sal_uInt16 nTyp,
 // search for merge data
 if ( !pMergeDataFile ){
 pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, 
false );
-
-// Init Languages
-if( Export::sLanguages.equalsIgnoreAsciiCase(ALL) )
-{
-aLanguages = pMergeDataFile-GetLanguages();
-isInitialized = true;
-}
-else if( !isInitialized )InitLanguages();
-
+aLanguages = pMergeDataFile-GetLanguages();
 }
 
 MergeEntrys *pEntrys = pMergeDataFile-GetMergeEntrys( pResData );
@@ -1546,14 +1531,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 
nMode )
 {
 if ( !pMergeDataFile ){
 pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, 
false );
-
-// Init Languages
-if (Export::sLanguages.equalsIgnoreAsciiCase(ALL))
-{
-aLanguages = pMergeDataFile-GetLanguages();
-isInitialized = true;
-}
-else if( !isInitialized )InitLanguages();
+aLanguages = pMergeDataFile-GetLanguages();
 
 }
 switch ( nMode ) {
@@ -1848,29 +1826,6 @@ void Export::SetChildWithText()
 }
 }
 
-void Export::InitLanguages( bool bMerge ){
-
-if( !isInitialized )
-{
-OString sTmp;
-OStringBoolHashMap aEnvLangs;
-
-sal_Int32 nIndex = 0;
-do
-{
-OString aToken = sLanguages.getToken(0, ',', nIndex);
-sTmp = aToken.getToken(0, '=').trim();
-if( bMerge  sTmp.equalsIgnoreAsciiCase(en-US) ){}
-else if( !( (sTmp[0]=='x' || sTmp[0]=='X')  sTmp[1]=='-' ) ){
-aLanguages.push_back( sTmp );
-}
-}
-while ( nIndex = 0 );
-
-isInitialized = true;
-}
-}
-
 void ParserQueue::Push( const QueueEntry aEntry )
 {
 sal_Int32 nLen = aEntry.sLine.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries helpcontent2 l10ntools/source translations

[Zolnai Tamás]

 dictionaries  |2 +-
 helpcontent2  |2 +-
 l10ntools/source/cfgmerge.cxx |7 ++-
 l10ntools/source/export.cxx   |   28 +++-
 l10ntools/source/lngmerge.cxx |3 +--
 l10ntools/source/xrmmerge.cxx |7 +++
 translations  |2 +-
 7 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 5acc994f4ed3e118453fb493226b751a6d9d3bce
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 06:37:05 2013 +0200

Remove obsolote 'empty string - -' behaviour

Change-Id: I1d81d4c5716c397b84c0a8959b21beacbbbf1138

diff --git a/dictionaries b/dictionaries
index 36776c3..26b7c42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
diff --git a/helpcontent2 b/helpcontent2
index 4fa8716..f25d6a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4fa871622ae5cb247520fc113d2278be758fa62c
+Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 44f9896..dcbcfb9 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -500,8 +500,7 @@ void CfgMerge::WorkOnText(OString rText, const OString 
rLangIndex)
 OString sContent;
 pEntrys-GetText( sContent, STRING_TYP_TEXT, rLangIndex );
 
-if ( !rLangIndex.equalsIgnoreAsciiCase(en-US) 
-( sContent != - )  !sContent.isEmpty())
+if ( !rLangIndex.equalsIgnoreAsciiCase(en-US)  
!sContent.isEmpty())
 {
 rText = helper::QuotHTML( rText );
 }
@@ -530,9 +529,7 @@ void CfgMerge::WorkOnResourceEnd()
 OString sContent;
 pEntrys-GetText( sContent, STRING_TYP_TEXT, sCur , sal_True );
 if (
-( 
!sCur.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(en-US)) ) 
-
-( sContent != - )  !sContent.isEmpty())
+( !sCur.equalsIgnoreAsciiCase(en-US) )  
!sContent.isEmpty())
 {
 
 OString sText = helper::QuotHTML( sContent);
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 1cbb426..d4d6e04 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -919,26 +919,28 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool 
bCreateNew )
 sXQHText = pResData-sQuickHelpText[ SOURCE_LANGUAGE ];
 sXTitle = pResData-sTitle[ SOURCE_LANGUAGE ];
 
-if (sXText.isEmpty())
-sXText = -;
-
-ConvertExportContent(sXText);
-ConvertExportContent(sXHText);
-ConvertExportContent(sXQHText);
-ConvertExportContent(sXTitle);
-
-common::writePoEntry(
-Transex3, *aOutput.mPo, global::inputPathname,
-pResData-sResTyp, sGID, sLID, sXHText, sXText);
+if( !sXText.isEmpty() )
+{
+ConvertExportContent(sXText);
+ConvertExportContent(sXHText);
+common::writePoEntry(
+Transex3, *aOutput.mPo, global::inputPathname,
+pResData-sResTyp, sGID, sLID, sXHText, sXText);
+}
 if( !sXQHText.isEmpty() )
+{
+ConvertExportContent(sXQHText);
 common::writePoEntry(
 Transex3, *aOutput.mPo, global::inputPathname, 
pResData-sResTyp,
 sGID, sLID, OString(), sXQHText, PoEntry::TQUICKHELPTEXT );
-
+}
 if( !sXTitle.isEmpty() )
+{
+ConvertExportContent(sXTitle);
 common::writePoEntry(
 Transex3, *aOutput.mPo, global::inputPathname, 
pResData-sResTyp,
 sGID, sLID, OString(), sXTitle, PoEntry::TTITLE );
+}
 
 if ( bCreateNew ) {
 pResData-sText[ SOURCE_LANGUAGE ] = ;
@@ -1508,7 +1510,7 @@ void Export::ResData2Output( MergeEntrys *pEntry, 
sal_uInt16 nType, const OStrin
 
 OString sText;
 sal_Bool bText = pEntry-GetText( sText, nType, sCur , sal_True );
-if ( bText  !sText.isEmpty()  sText != - ) {
+if ( bText  !sText.isEmpty() ) {
 OString sOutput;
 if ( bNextMustBeDefineEOL)  {
 if ( bFirst )
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index f343b26..273fe19 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -297,8 +297,7 @@ sal_Bool LngParser::Merge(
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur, 
sal_True );
 if( sCur == qtz )
 sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
-if (( !sNewText.isEmpty()) 
-!(( 
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM(x-comment)))  ( sNewText == - 

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/cfgmerge.hxx |3 --
 l10ntools/inc/export.hxx   |2 -
 l10ntools/inc/helpmerge.hxx|2 -
 l10ntools/inc/lngmerge.hxx |2 -
 l10ntools/source/cfgmerge.cxx  |   24 +
 l10ntools/source/export.cxx|   55 -
 l10ntools/source/helpex.cxx|2 -
 l10ntools/source/helpmerge.cxx |   39 +++--
 l10ntools/source/lngex.cxx |2 -
 l10ntools/source/lngmerge.cxx  |   22 
 l10ntools/source/localize.cxx  |1 
 l10ntools/source/uimerge.cxx   |8 -
 l10ntools/source/xrmmerge.cxx  |   17 +++-
 13 files changed, 63 insertions(+), 116 deletions(-)

New commits:
commit 4146406205ce6f939944685e1931dcd45f3de708
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 07:21:07 2013 +0200

l10ntools: export use only en-US

So no need to ad it in a commandline parameter.
No need to use a vector to store languages.

Change-Id: I1f7d3bd131b5a9ff23d403cee4ac6804ae8e0a0b

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index c34ba06..00838de 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -160,8 +160,7 @@ protected:
 public:
 CfgExport(
 const OString rOutputFile,
-const OString rFilePath,
-const OString rLanguage
+const OString rFilePath
 );
 ~CfgExport();
 };
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 10223cd..719102d 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -243,7 +243,7 @@ private:
 void CutComment( OString rText );
 
 public:
-Export(const OString rOutput, const OString rLanguage);
+Export( const OString rOutput );
 Export(const OString rMergeSource, const OString rOutput, const OString 
rLanguage);
 ~Export();
 
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 95aad6d..1f9c90a 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -43,7 +43,7 @@ public:
 
 /// Method append a PO file with the content of a parsed XML file
 /// @PRECOND rHelpFile is valid
-static bool CreatePO( const OString rPOFile_in, const OString sHelpFile, 
const OString rLanguage,
+static bool CreatePO( const OString rPOFile_in, const OString sHelpFile,
   XMLFile *pXmlFile, const OString rGsi1 );
 
 /// Method merges the String from the POfile into XMLfile. Both Strings must
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 8441824..0f98eac 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -53,7 +53,7 @@ public:
 sal_Bool bULFFormat);
 ~LngParser();
 
-sal_Bool CreatePO( const OString rPOFile, const OString rLanguage );
+sal_Bool CreatePO( const OString rPOFile );
 sal_Bool Merge(const OString rPOFile, const OString rDestinationFile,
  const OString rLanguage );
 };
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index dcbcfb9..d6a72ed 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -72,7 +72,7 @@ FILE * init(int argc, char ** argv) {
 } else {
 global::parser.reset(
 new CfgExport(
-aArgs.m_sOutputFile, global::inputPathname, aArgs.m_sLanguage 
));
+aArgs.m_sOutputFile, global::inputPathname ));
 }
 
 return pFile;
@@ -359,8 +359,7 @@ void CfgParser::Error(const OString rError)
 /*/
 CfgExport::CfgExport(
 const OString rOutputFile,
-const OString rFilePath,
-const OString rLanguage
+const OString rFilePath
 )
 /*/
 : sPath( rFilePath )
@@ -371,7 +370,6 @@ CfgExport::CfgExport(
 std::cerr  ERROR: Unable to open output file:   rOutputFile  
\n;
 std::exit(EXIT_FAILURE);
 }
-aLanguages.push_back( rLanguage );
 }
 
 /*/
@@ -388,7 +386,6 @@ void CfgExport::WorkOnResourceEnd()
 if ( bLocalize ) {
 if ( 
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(en-US))].getLength() )
 {
-OString sFallback = 
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(en-US))];
 OString sXComment = 
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(x-comment))];
 OString sLocalId = pStackData-sIdentifier;
 OString sGroupId;
@@ -400,20 +397,13 @@ void CfgExport::WorkOnResourceEnd()
 sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
 }
 
-for (size_t n = 0; n  aLanguages.size(); n++)
-{
-OString sCur = aLanguages[ n ];
-
-OString sText = pStackData-sText[ sCur ];
-if 

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/lngmerge.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 8287da2fbc09882893642b7a6e3ca555b2b956b3
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 09:04:59 2013 +0200

KeyId do not contain special chars so ulfex can use it again

Change-Id: Icfb581ac2771df39c71ad12f94dba5d51f3c4ec5

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 27c7d5d..98049f5 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -247,8 +247,6 @@ sal_Bool LngParser::Merge(
 {
 OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, 
sLang, sal_True );
-if( sLang == qtz )
-sNewText = sNewText.copy(sNewText.indexOf(|) 
+ 2);
 
 if ( !sNewText.isEmpty()) {
 OString *pLine = (*pLines)[ nPos ];
@@ -285,8 +283,6 @@ sal_Bool LngParser::Merge(
 
 OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur, 
sal_True );
-if( sCur == qtz )
-sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
 if ( !sNewText.isEmpty()  sCur != x-comment)
 {
 OString sLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/localize.cxx |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 336e04496fa06cef99351692d60b2618c969d787
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 09:23:16 2013 +0200

Some empty pot directories remained

Change-Id: I5aedd4595c3f676deaedddf80c3a96250015f2ed

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 8bdec41..cc1e1de 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -284,19 +284,6 @@ void handleFilesOfDir(
 }
 }
 }
-//Remove empty pot directories
-OUString sPoPath =
-OStringToOUString(
-rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
-OUString sPoUrl;
-if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
-!= osl::FileBase::E_None)
-{
-cerr  Error: Cannot convert pathname to URL in   __FILE__  , 
in line   __LINE__  \n
-  OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr()  
\n;
-throw false; //TODO
-}
-osl::Directory::remove(sPoUrl);
 }
 
 bool includeProject(const OString rProject) {
@@ -444,6 +431,20 @@ void handleDirectory(
 cerr  Error: Cannot close directory\n;
 throw false; //TODO
 }
+
+//Remove empty pot directory
+OUString sPoPath =
+OStringToOUString(
+rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
+OUString sPoUrl;
+if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
+!= osl::FileBase::E_None)
+{
+cerr  Error: Cannot convert pathname to URL in   __FILE__  , 
in line   __LINE__  \n
+  OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr()  
\n;
+throw false; //TODO
+}
+osl::Directory::remove(sPoUrl);
 }
 
 void handleProjects(char * sSourceRoot, char const * sDestRoot)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/lngmerge.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1e53d3b87aef18db7bce0c3990cc1403d1932fe2
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 09:52:05 2013 +0200

Revert KeyId do not contain special chars so ulfex can use it again

This reverts commit 8287da2fbc09882893642b7a6e3ca555b2b956b3.

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 98049f5..27c7d5d 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -247,6 +247,8 @@ sal_Bool LngParser::Merge(
 {
 OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, 
sLang, sal_True );
+if( sLang == qtz )
+sNewText = sNewText.copy(sNewText.indexOf(|) 
+ 2);
 
 if ( !sNewText.isEmpty()) {
 OString *pLine = (*pLines)[ nPos ];
@@ -283,6 +285,8 @@ sal_Bool LngParser::Merge(
 
 OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur, 
sal_True );
+if( sCur == qtz )
+sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
 if ( !sNewText.isEmpty()  sCur != x-comment)
 {
 OString sLine;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/Executable_localize.mk l10ntools/Executable_propex.mk l10ntools/Executable_ulfex.mk l10ntools/inc l10ntools/source unusedcode.easy

[Zolnai Tamás]

 l10ntools/Executable_localize.mk |1 
 l10ntools/Executable_propex.mk   |1 
 l10ntools/Executable_ulfex.mk|1 
 l10ntools/inc/export.hxx |2 
 l10ntools/inc/helper.hxx |5 +
 l10ntools/inc/po.hxx |3 -
 l10ntools/inc/xrmmerge.hxx   |3 -
 l10ntools/source/export.cxx  |   85 ++---
 l10ntools/source/helper.cxx  |   43 
 l10ntools/source/merge.cxx   |   14 -
 l10ntools/source/po.cxx  |  100 +--
 l10ntools/source/stringmerge.cxx |7 +-
 l10ntools/source/xrmmerge.cxx|   29 +--
 unusedcode.easy  |3 -
 14 files changed, 99 insertions(+), 198 deletions(-)

New commits:
commit d885a85a48a4706934e170b7a6671e5e029089a0
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 05:43:53 2013 +0200

Make l10ntools executables escape clear

Steps of escaping process:
1. Executables unescape the string for export(if necessary)
2. Po class work with unescaped string
3. Escape strings to PO format and write out
4. Read from PO and unescape strings
5. Executables make own transformation on string and merge

Use general functions for escaping (helper)
Delete unneeded escaping methods(xrmmerge, merge)
Delete some unused method from PoEntry class

Change-Id: I7f9414581aae9e6de7d1573862a32cdbd68c9545

diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk
index b673289..cdc323a 100644
--- a/l10ntools/Executable_localize.mk
+++ b/l10ntools/Executable_localize.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\
 
 $(eval $(call gb_Executable_use_externals,localize,\
 boost_headers \
+libxml2 \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk
index c5bb06d..c359061 100644
--- a/l10ntools/Executable_propex.mk
+++ b/l10ntools/Executable_propex.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\
 
 $(eval $(call gb_Executable_use_externals,propex,\
 boost_headers \
+libxml2 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index bd7b7a5..0212d7d 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Executable_add_exception_objects,ulfex,\
 
 $(eval $(call gb_Executable_use_externals,ulfex,\
 boost_headers \
+libxml2 \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 9575dcd..0a2c10e 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -240,6 +240,7 @@ private:
 void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString 
rTextType );
 void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
 void ConvertMergeContent( OString rText );
+void ConvertExportContent( OString rText );
 
 void WriteToMerged(const OString rText , bool bSDFContent);
 void SetChildWithText();
@@ -296,7 +297,6 @@ public:
 bTitleFirst[ rId ] = true;
 }
 sal_Bool GetText( OString rReturn, sal_uInt16 nTyp, const OString 
nLangIndex, sal_Bool bDel = sal_False );
-sal_Bool GetTransex3Text( OString rReturn, sal_uInt16 nTyp, const OString 
nLangIndex, sal_Bool bDel = sal_False );
 
 };
 
diff --git a/l10ntools/inc/helper.hxx b/l10ntools/inc/helper.hxx
index 1292f44..9ec3996 100644
--- a/l10ntools/inc/helper.hxx
+++ b/l10ntools/inc/helper.hxx
@@ -25,6 +25,11 @@
 
 namespace helper {
 
+OString escapeAll(
+const OString rText, const OString rUnEscaped, const OString rEscaped );
+OString unEscapeAll(
+const OString rText, const OString rEscaped, const OString rUnEscaped  
);
+
 OString QuotHTML( const OString rString );
 OString UnQuotHTML( const OString rString );
 
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 5ffad8e..26bbedf 100755
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -61,9 +61,6 @@ public:
 OString getMsgStr() const;
 boolisFuzzy() const;
 OString getKeyId() const;
-voidsetMsgId(const OString rMsgId);
-voidsetMsgStr(const OString rMsgStr);
-voidsetFuzzy(const bool bFuzzy);
 
 static bool IsInSameComp(const PoEntry rPo1,const PoEntry rPo2);
 
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index ca6a820..9e5fbae 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -59,9 +59,6 @@ protected:
 OString GetGID() { return sGID; }
 OString GetLID() { return sLID; }
 
-void ConvertStringToDBFormat( OString rString );
-void ConvertStringToXMLFormat( OString rString );
-
 public:
 XRMResParser();
 virtual ~XRMResParser();
diff --git a/l10ntools/source/export.cxx 

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/export.hxx |   51 --
 l10ntools/source/cfgmerge.cxx|6 +-
 l10ntools/source/export.cxx  |   57 +
 l10ntools/source/helpmerge.cxx   |6 +-
 l10ntools/source/lngmerge.cxx|4 -
 l10ntools/source/merge.cxx   |   87 ++-
 l10ntools/source/propmerge.cxx   |4 -
 l10ntools/source/stringmerge.cxx |6 +-
 l10ntools/source/treemerge.cxx   |6 +-
 l10ntools/source/uimerge.cxx |4 -
 l10ntools/source/xrmmerge.cxx|   11 ++--
 11 files changed, 87 insertions(+), 155 deletions(-)

New commits:
commit be30e0e139ecc068665c8e46020b60356b05cfd6
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Apr 13 06:02:11 2013 +0200

Delete obsolote platform from l10ntools merge

Change-Id: I5e5b87355d3d6e369c8fccd7078581758abb3b10

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 0a2c10e..10223cd 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -43,7 +43,7 @@
 
 #define NO_TRANSLATE_ISOx-no-translate
 
-class PFormEntrys;
+class MergeEntrys;
 class MergeData;
 
 typedef boost::unordered_mapOString, OString, OStringHash
@@ -52,9 +52,6 @@ typedef boost::unordered_mapOString, OString, OStringHash
 typedef boost::unordered_mapOString, bool, OStringHash
 OStringBoolHashMap;
 
-typedef boost::unordered_mapOString, PFormEntrys*, OStringHash
-PFormEntrysHashMap;
-
 typedef boost::unordered_mapOString, MergeData*, OStringHash
 MergeDataHashMap;
 
@@ -109,8 +106,8 @@ public:
 class ResData
 {
 public:
-ResData(const OString rPF, const OString rGId);
-ResData(const OString rPF, const OString rGId , const OString 
rFilename);
+ResData( const OString rGId );
+ResData( const OString rGId , const OString rFilename );
 ~ResData();
 sal_Bool SetId(const OString rId, sal_uInt16 nLevel);
 
@@ -153,8 +150,6 @@ public:
 ExportList  *pItemList;
 ExportList  *pFilterList;
 ExportList  *pPairedList;
-
-OString sPForm;
 };
 
 
@@ -196,8 +191,6 @@ private:
 
 ResStack aResStack; // stack for parsing recursive
 
-OString sActPForm;   // hold cur. system
-
 sal_Bool bDefine;   // cur. res. in a define?
 sal_Bool bNextMustBeDefineEOL;  // define but no \ at lineend
 std::size_t nLevel; // res. recursiv? how deep?
@@ -237,7 +230,7 @@ private:
 
 sal_Bool PrepareTextToMerge(OString rText, sal_uInt16 nTyp,
 OString rLangIndex, ResData *pResData);
-void ResData2Output( PFormEntrys *pEntry, sal_uInt16 nType, const OString 
rTextType );
+void ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OString 
rTextType );
 void MergeRest( ResData *pResData, sal_uInt16 nMode = MERGE_MODE_NORMAL );
 void ConvertMergeContent( OString rText );
 void ConvertExportContent( OString rText );
@@ -263,19 +256,17 @@ public:
 
 
 //
-// class PFormEntrys
+// class MergeEntrys
 //
 
-/**
-* Purpose: holds information of data to merge (one pform)
-**/
+/**
+ * Purpose: holds information of data to merge
+ */
 
-class PFormEntrys
+class MergeEntrys
 {
 friend class MergeDataFile;
 private:
-OString data_; //TODO
-OString sHelpText; // empty string
 OStringHashMap sText;
 OStringBoolHashMap bTextFirst;
 OStringHashMap sQuickHelpText;
@@ -284,7 +275,7 @@ private:
 OStringBoolHashMap bTitleFirst;
 
 public:
-PFormEntrys( const OString rPForm ) : data_( rPForm ) {};
+MergeEntrys(){};
 void InsertEntry(const OString rId, const OString rText,
 const OString rQuickHelpText, const OString rTitle)
 {
@@ -317,15 +308,11 @@ public:
 OString sGID;
 OString sLID;
 OString sFilename;
-PFormEntrysHashMap aMap;
+MergeEntrys* pMergeEntrys;
 public:
-MergeData( const OString rTyp, const OString rGID, const OString rLID , 
const OString rFilename )
-: sTyp( rTyp ), sGID( rGID ), sLID( rLID ) , sFilename( rFilename 
) {};
+MergeData( const OString rTyp, const OString rGID, const OString rLID , 
const OString rFilename );
 ~MergeData();
-PFormEntrys* GetPFormEntries();
-
-void Insert( PFormEntrys* pfEntrys );
-PFormEntrys* GetPFObject( const OString rPFO );
+MergeEntrys* GetMergeEntries();
 
 sal_Bool operator==( ResData *pData );
 };
@@ -347,10 +334,10 @@ class MergeDataFile
 
 MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = 
false );
 void InsertEntry(const OString rTYP, const OString rGID,
-const OString rLID, const OString rPFO,
-const OString nLang, const OString rTEXT,
-const OString rQHTEXT, const OString rTITLE,
-const OString sFilename, bool bCaseSensitive);
+const 

[Libreoffice-commits] core.git: dbaccess/source desktop/source sw/source

[Zolnai Tamás]

 dbaccess/source/ui/dlg/AutoControls_tmpl.hrc  |2 
 desktop/source/deployment/gui/dp_gui_dialog.src   |   30 ++--
 desktop/source/deployment/gui/dp_gui_updatedialog.src |4 -
 desktop/source/deployment/gui/dp_gui_versionboxes.src |   42 +-
 sw/source/ui/app/app.src  |2 
 5 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit ca776f348aa90119e6281eb5d979de2d56786e08
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu Apr 4 21:14:32 2013 +0200

Not escape single quotes in src\hrc files

Escaping them is not needed.
Plus escaped quotes are taken into po files and
make translater's work more uncomfortable.

Change-Id: I2ea7218120bc3d9967bdf51091ef091acbf2b73c

diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc 
b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index 8bdc3f2..bf37c0d 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -405,7 +405,7 @@

 \
 String STR_AUTOFIELDSEPARATORLIST  
 \
 {  
 \
-Text [ x-comment ] = EM Dec 2002: \'Space\' refers to what you get 
when you hit the space bar on your keyboard.;  \
+Text [ x-comment ] = EM Dec 2002: 'Space' refers to what you get when 
you hit the space bar on your keyboard.;  \
 Text [ en-US ] = ;\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32 ;
 \
 }; 
 \

 \
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src 
b/desktop/source/deployment/gui/dp_gui_dialog.src
index 08736f6..4d523f7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -216,7 +216,7 @@ ModalDialog RID_DLG_LICENSE
 Size = MAP_APPFONT(COL3_WIDTH+COL4_WIDTH, ROW3_HEIGHT);
 WordBreak = TRUE;
 NoLabel = TRUE;
-Text [ en-US ] = Read the complete License Agreement. Use the scroll 
bar or the \'Scroll Down\' button in this dialog to view the entire license 
text.;
+Text [ en-US ] = Read the complete License Agreement. Use the scroll 
bar or the 'Scroll Down' button in this dialog to view the entire license 
text.;
 };
 
 FixedText FT_LICENSE_BODY_2
@@ -233,7 +233,7 @@ ModalDialog RID_DLG_LICENSE
 Size = MAP_APPFONT(COL3_WIDTH+COL4_WIDTH, ROW4_HEIGHT);
 WordBreak = TRUE;
 NoLabel = TRUE;
-Text [ en-US ] = Accept the License Agreement for the extension by 
pressing the \'Accept\' button.;
+Text [ en-US ] = Accept the License Agreement for the extension by 
pressing the 'Accept' button.;
 
 };
 
@@ -329,17 +329,17 @@ ModalDialog RID_DLG_SHOW_LICENSE
 WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
 Buttons = WB_OK_CANCEL;
 DefButton = WB_DEF_OK;
-Message[en-US] = You are about to install the extension \'%NAME\'.\n
-Click \'OK\' to proceed with the installation.\n
-Click \'Cancel\' to stop the installation.;
+Message[en-US] = You are about to install the extension '%NAME'.\n
+Click 'OK' to proceed with the installation.\n
+Click 'Cancel' to stop the installation.;
 };
 
 WarningBox RID_WARNINGBOX_REMOVE_EXTENSION {
 Buttons = WB_OK_CANCEL;
 DefButton = WB_DEF_CANCEL;
-Message[en-US] = You are about to remove the extension \'%NAME\'.\n
-Click \'OK\' to remove the extension.\n
-Click \'Cancel\' to stop removing the extension.;
+Message[en-US] = You are about to remove the extension '%NAME'.\n
+Click 'OK' to remove the extension.\n
+Click 'Cancel' to stop removing the extension.;
 };
 
 WARNINGBOX RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
@@ -348,8 +348,8 @@ WARNINGBOX RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
 DefButton = WB_DEF_CANCEL;
 Message[en-US] = Make sure that no further users are working with the 
same 
 %PRODUCTNAME, when changing shared extensions in a multi user 
environment.\n
-Click \'OK\' to remove the extension.\n
-Click \'Cancel\' to stop removing the extension.;
+Click 'OK' to remove the extension.\n
+Click 'Cancel' to stop removing the extension.;
 };
 
 WARNINGBOX RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
@@ -358,8 +358,8 @@ WARNINGBOX RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
 DefButton = WB_DEF_CANCEL;
 Message[en-US] = Make sure that no further users are working with the 
same 
 %PRODUCTNAME, when changing 

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/xmlparse.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 68c72dfb9db5c452bad13203699b17c4f4fcf6cc
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Tue Apr 2 16:16:12 2013 +0200

Fix assertion in xmlparse and call this function with more care

Plus change range to [nStart,nEnd).

Change-Id: I1570d07fdc90a6b2bdf3eef7914958212cbbaa87

diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 651a27a..954aed0 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1180,9 +1180,10 @@ static icu::UnicodeString lcl_QuotRange(
 const sal_Int32 nEnd, bool bInsideTag = false )
 {
 icu::UnicodeString sReturn;
+assert( nStart  nEnd );
 assert( nStart = 0 );
-assert( nEnd  rString.length() );
-for (sal_Int32 i = nStart; i = nEnd; ++i)
+assert( nEnd = rString.length() );
+for (sal_Int32 i = nStart; i  nEnd; ++i)
 {
 switch (rString[i])
 {
@@ -1258,20 +1259,22 @@ OUString XMLUtil::QuotHTML( const OUString rString )
 while( aRegexMatcher.find(nStartPos, nIcuErr)  nIcuErr == U_ZERO_ERROR )
 {
 nStartPos = aRegexMatcher.start(nIcuErr);
-sReturn.append(lcl_QuotRange(sSource, nEndPos, nStartPos-1));
+if ( nEndPos  nStartPos )
+sReturn.append(lcl_QuotRange(sSource, nEndPos, nStartPos));
 nEndPos = aRegexMatcher.end(nIcuErr);
 icu::UnicodeString sMatch = aRegexMatcher.group(nIcuErr);
 if( lcl_isTag(sMatch) )
 {
 sReturn.append();
-sReturn.append(lcl_QuotRange(sSource, nStartPos+1, nEndPos-2, 
true));
+sReturn.append(lcl_QuotRange(sSource, nStartPos+1, nEndPos-1, 
true));
 sReturn.append();
 }
 else
-sReturn.append(lcl_QuotRange(sSource, nStartPos, nEndPos-1));
+sReturn.append(lcl_QuotRange(sSource, nStartPos, nEndPos));
 ++nStartPos;
 }
-sReturn.append(lcl_QuotRange(sSource, nEndPos, sSource.length()-1));
+if( nEndPos  sSource.length() )
+sReturn.append(lcl_QuotRange(sSource, nEndPos, sSource.length()));
 sReturn.append('\0');
 return OUString(reinterpret_castconst sal_Unicode*(sReturn.getBuffer()));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Broken localized build

[Zolnai Tamás]

Hi,

  Yes, that was my commit caused the problem. I forgot test whether the
tests work. By now they work well.

Regards,
Tamás

2013/4/2 Olivier Hallot olivier.hal...@documentfoundation.org

 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1

 After a  git pull and make clean, I can't pass through this step:

 - --with-help
 - --lang=en-US pt-BR

 - -%---

 [build HPX] hu/helpcontent2/source/text/sbasic/guide
 [build HPX] hu/helpcontent2/source/text/sbasic/shared
 [build HPX] hu/helpcontent2/source/text/sbasic/shared/01
 helpex: /home/tdf/git/core/l10ntools/source/xmlparse.cxx:1183:
 icu_51::UnicodeString {anonymous}::lcl_QuotRange(const
 icu_51::UnicodeString, sal_Int32, sal_Int32, bool): Assertion `nStart 
 0  nStart  rString.length()' failed.
 helpex: /home/tdf/git/core/l10ntools/source/xmlparse.cxx:1183:
 icu_51::UnicodeString {anonymous}::lcl_QuotRange(const
 icu_51::UnicodeString, sal_Int32, sal_Int32, bool): Assertion `nStart 
 0  nStart  rString.length()' failed.
 Aborted (core dumped)
 make[1]: **

 [/home/tdf/git/core/workdir/unxlngx6/HelpTranslatePartTarget/hu/helpcontent2/source/text/sbasic/shared/done]
 Erro 134
 make[1]: *** Esperando que os outros processos terminem
 Aborted (core dumped)
 make[1]: **

 [/home/tdf/git/core/workdir/unxlngx6/HelpTranslatePartTarget/hu/helpcontent2/source/text/sbasic/guide/done]
 Erro 134
 make: ** [build] Erro 2

 - -%---

 Any clues?
 - --
 Olivier Hallot
 Founder, Board of Directors Member - The Document Foundation
 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
 Fundação responsável civilmente, de acordo com o direito civil
 Detalhes Legais: http://www.documentfoundation.org/imprint
 LibreOffice translation leader for Brazilian Portuguese
 +55-21-8822-8812
 -BEGIN PGP SIGNATURE-
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: Using GnuPG with undefined - http://www.enigmail.net/

 iQEcBAEBAgAGBQJRWgkOAAoJEJp3R7nH3vLx6KAIAIhbp9iPPes5yk1iruPaOg23
 0P6PvxivXe41CHaYJ2aEkY9IXE9OqNyMWuqZ2ixistyHiFkv0XMMCBkqXpz2RCD6
 uiZ52hlZDlDJMTZ2Ryr64atu5ZRZtoWp4gyNslQIvIxoQkKOqnYUvCUWjNNTcDxT
 X33FOCb0kfUyEVwRqe0xioqcbXF0aW1Z4G9k9Ty2JQ9VwbY3RfXEEzgQiFK6yDr2
 p6z+VXJHfDQR8GHAnymOr3Jb+n8guV/MP8zSWfePOrzBCpSzXVRjduMj0PfU5m/X
 62oYwGT2KdzbnQ1aOJ+2Gpo44mplvV9m1Rb5782HWBvtq5tv8KAtEh0kG2Gjz9E=
 =06Ra
 -END PGP SIGNATURE-
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice-commits] core.git: android/experimental

[Zolnai Tamás]

 android/experimental/DocumentLoader/res/values/string.xml  |4 
 android/experimental/DocumentLoader/res/values/strings.xml |4 
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7640fa315e41395baf169cb864e30a94a6d6e42a
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Tue Apr 2 21:27:04 2013 +0200

Typo: string.xml-strings.xml

To make available for localization

Change-Id: I5469549422c7a2d2618ed9e836895f6698328b17

diff --git a/android/experimental/DocumentLoader/res/values/string.xml 
b/android/experimental/DocumentLoader/res/values/string.xml
deleted file mode 100644
index 148461b..000
--- a/android/experimental/DocumentLoader/res/values/string.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-?xml version=1.0 encoding=utf-8?
-resources
-string name=go_to_pageGo to page/string
-/resources
diff --git a/android/experimental/DocumentLoader/res/values/strings.xml 
b/android/experimental/DocumentLoader/res/values/strings.xml
new file mode 100644
index 000..148461b
--- /dev/null
+++ b/android/experimental/DocumentLoader/res/values/strings.xml
@@ -0,0 +1,4 @@
+?xml version=1.0 encoding=utf-8?
+resources
+string name=go_to_pageGo to page/string
+/resources
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/test dictionaries helpcontent2

[Zolnai Tamás]

 desktop/test/deployment/update/website_update/update/web6/description.xml |
2 +-
 desktop/test/deployment/update/website_update/update/web7/description.xml |
2 +-
 dictionaries  |
2 +-
 helpcontent2  |
2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8ff5d1d5e5e5270e22009266d2ec9debb88196f0
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Tue Apr 2 21:37:25 2013 +0200

No localize descripiton.xml of test tool

Change-Id: Ie6d155d158244825d4fc2731dc264ac9d4dd875c

diff --git 
a/desktop/test/deployment/update/website_update/update/web6/description.xml 
b/desktop/test/deployment/update/website_update/update/web6/description.xml
index a800d64..47a32a2 100644
--- a/desktop/test/deployment/update/website_update/update/web6/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web6/description.xml
@@ -21,7 +21,7 @@
 version value=2.0 /
 identifier 
value=org.openoffice/framework/desktop/test/deployment/update/website_update/web6/
 display-name
-  name lang=en-USweb-based update test 1/name
+  nameweb-based update test 1/name
 /display-name
 
 /description
diff --git 
a/desktop/test/deployment/update/website_update/update/web7/description.xml 
b/desktop/test/deployment/update/website_update/update/web7/description.xml
index fc5f40f..9d5e456 100644
--- a/desktop/test/deployment/update/website_update/update/web7/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web7/description.xml
@@ -21,7 +21,7 @@
 version value=2.0 /
 identifier 
value=org.openoffice/framework/desktop/test/deployment/update/website_update/web7/
 display-name
-  name lang=en-USweb-based update test 1/name
+  nameweb-based update test 1/name
 /display-name
 
 publisher
diff --git a/dictionaries b/dictionaries
index 36776c3..26b7c42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
diff --git a/helpcontent2 b/helpcontent2
index 368e41d..f25d6a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 368e41dfa3f5f1d0cd04c9605cf36db49b9d03b3
+Subproject commit f25d6a1081dd929a8872fcd9305b5f06355d3337
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source officecfg/registry

[Zolnai Tamás]

 filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu  
  |1 
 filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
  |1 
 filter/source/config/fragments/filters/HTML_ui.xcu 
  |1 
 filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
  |1 
 filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu 
  |1 
 filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu 
  |1 
 filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu 
  |1 
 filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu 
  |1 
 filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu   
  |1 
 filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu   
  |1 
 filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
  |1 
 filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu   
  |1 
 filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
  |1 
 filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu 
  |1 
 filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
  |1 
 filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu  
  |1 
 filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
  |1 
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu  
  |1 
 
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
 |1 
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu  
  |1 
 filter/source/config/fragments/filters/Text__encoded__ui.xcu   
  |1 
 filter/source/config/fragments/filters/Text_ui.xcu 
  |1 
 filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu   
  |1 
 
filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu 
 |1 
 
filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu 
 |1 
 filter/source/config/fragments/filters/draw_html_Export_ui.xcu 
  |1 
 filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu  
  |1 
 
filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
|1 
 filter/source/config/fragments/filters/impress_html_Export_ui.xcu  
  |1 
 
filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
  |1 
 
filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
 |1 
 
filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
|1 
 
filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
  |1 
 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu 
  |1 
 officecfg/registry/data/org/openoffice/Office/SFX.xcu  
  |   20 --
 35 files changed, 54 deletions(-)

New commits:
commit 43d426aca1f5ef699db9efe8e370677be85165e5
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Tue Apr 2 22:07:07 2013 +0200

Some cleanup in xcu files

x-translate entries are unused so remove them.
SFX.xcu: All entry use the same value, it is useless
to add this for all language. It's enough to add an
en-US entry and all local will use it's value.

Change-Id: I88d807a092f11d057ed6ee8809eb5d6851e87f95

diff --git a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu 
b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
index 1d13a85..db29def 100644
--- a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
@@ -18,6 +18,5 @@
 node oor:name=HTML (StarCalc)
 prop oor:name=UIName
 value xml:lang=en-USHTML Document (Calc)/value
- 

[Libreoffice-commits] core.git: l10ntools/Executable_cfgex.mk l10ntools/Executable_localize.mk l10ntools/Executable_propex.mk l10ntools/Executable_stringex.mk l10ntools/Executable_transex3.mk l10ntool

[Zolnai Tamás]

 l10ntools/Executable_cfgex.mk  |3 
 l10ntools/Executable_localize.mk   |2 
 l10ntools/Executable_propex.mk |2 
 l10ntools/Executable_stringex.mk   |3 
 l10ntools/Executable_transex3.mk   |3 
 l10ntools/Executable_treex.mk  |3 
 l10ntools/Executable_uiex.mk   |3 
 l10ntools/Executable_ulfex.mk  |2 
 l10ntools/StaticLibrary_transex.mk |1 
 l10ntools/inc/helper.hxx   |3 
 l10ntools/inc/xmlparse.hxx |8 -
 l10ntools/source/cfgmerge.cxx  |   32 ---
 l10ntools/source/helper.cxx|   59 -
 l10ntools/source/helpmerge.cxx |6 -
 l10ntools/source/po.cxx|   82 ---
 l10ntools/source/uimerge.cxx   |2 
 l10ntools/source/xmlparse.cxx  |  157 +++--
 17 files changed, 167 insertions(+), 204 deletions(-)

New commits:
commit ce51bf1a6ef36bbd1eea751add342cae6f1004d2
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sun Mar 31 20:11:57 2013 +0200

Make a bit cleaner transformation of help strings

*Not escape tags and double quots in tags,
 but find tags(icu regexp) when merge and
 use this infromation to make strings valid.
*Define a new Quot function for helpex,
 which works with icu UnicodeCharacter.
*Move tag search to xmlparse.cxx and use icu
 just in helpex.
*QuotHTML not unescape just replace xml charcters.
 (unescaping is also useless in uimerge.cxx)
*Move UnQuotHTML() to helper.
 (was used it in xmlparse.cxx and cfgmerge.cxx)
*Use UnQuotHTML() in uimerge.cxx too.

Change-Id: Ice8940ef69279709a1c5d84c6ae1b0d62a71ca76

diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 7d23fa4..0083d95 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -49,8 +49,7 @@ $(eval $(call gb_Executable_add_exception_objects,cfgex,\
 
 $(eval $(call gb_Executable_use_externals,cfgex,\
 boost_headers \
-icuuc \
-icui18n \
+libxml2 \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk
index 5f3cc62..b673289 100644
--- a/l10ntools/Executable_localize.mk
+++ b/l10ntools/Executable_localize.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\
 
 $(eval $(call gb_Executable_use_externals,localize,\
 boost_headers \
-icuuc \
-icui18n \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk
index f98706f..c5bb06d 100644
--- a/l10ntools/Executable_propex.mk
+++ b/l10ntools/Executable_propex.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\
 
 $(eval $(call gb_Executable_use_externals,propex,\
 boost_headers \
-icuuc \
-icui18n \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_stringex.mk b/l10ntools/Executable_stringex.mk
index 9545dd5..4f9edfd 100644
--- a/l10ntools/Executable_stringex.mk
+++ b/l10ntools/Executable_stringex.mk
@@ -31,9 +31,6 @@ $(eval $(call gb_Executable_add_exception_objects,stringex,\
 $(eval $(call gb_Executable_use_externals,stringex,\
 boost_headers \
 libxml2 \
-icuuc \
-icui18n \
-icu_headers \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index 5178cd5..b43bc89 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -51,9 +51,6 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\
 
 $(eval $(call gb_Executable_use_externals,transex3,\
 boost_headers \
-icuuc \
-icui18n \
-icu_headers \
 libxml2 \
 ))
 
diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk
index c8ff48c..976dc13 100644
--- a/l10ntools/Executable_treex.mk
+++ b/l10ntools/Executable_treex.mk
@@ -31,9 +31,6 @@ $(eval $(call gb_Executable_add_exception_objects,treex,\
 $(eval $(call gb_Executable_use_externals,treex,\
 boost_headers \
 libxml2 \
-icuuc \
-icui18n \
-icu_headers \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index 0c142c0..064b207 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -31,9 +31,6 @@ $(eval $(call gb_Executable_use_externals,uiex,\
 libxml2 \
 libxslt \
 boost_headers \
-icuuc \
-icui18n \
-icu_headers \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index cd9d86e..bd7b7a5 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_Executable_add_exception_objects,ulfex,\
 
 $(eval $(call gb_Executable_use_externals,ulfex,\
 boost_headers \
-icuuc \
-icui18n \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/l10ntools/StaticLibrary_transex.mk 

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/cfgmerge.cxx |   59 +-
 l10ntools/source/helper.cxx   |3 ++
 2 files changed, 5 insertions(+), 57 deletions(-)

New commits:
commit c4745302f3bf6e9d4f94033391979deb8437c788
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sun Mar 31 22:10:05 2013 +0200

There is no Arg tag in xcu localizable strings

So no reason to work with it.
So can use helper function after
make it to handle single quote.

Change-Id: Ic2eb901148c3ae31316607b41350bbad79a639db

diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index fd9474a..0aa53f8 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -84,61 +84,6 @@ void workOnTokenSet(int nTyp, char * pTokenText) {
 
 }
 
-namespace
-{
-
-static OString lcl_QuoteHTML( const OString rString )
-{
-rtl::OStringBuffer sReturn;
-for ( sal_Int32 i = 0; i  rString.getLength(); i++ ) {
-rtl::OString sTemp = rString.copy( i );
-if ( sTemp.match( Arg n= ) ) {
-while ( i  rString.getLength()  rString[i] != '' ) {
- sReturn.append(rString[i]);
-i++;
-}
-if ( rString[i] == '' ) {
-sReturn.append('');
-i++;
-}
-}
-if ( i  rString.getLength()) {
-switch ( rString[i]) {
-case '':
-sReturn.append(lt;);
-break;
-
-case '':
-sReturn.append(gt;);
-break;
-
-case '\':
-sReturn.append(quot;);
-break;
-
-case '\'':
-sReturn.append(apos;);
-break;
-
-case '':
-if ((( i + 4 )  rString.getLength()) 
-( rString.copy( i, 5 ) == amp; ))
-sReturn.append(rString[i]);
-else
-sReturn.append(amp;);
-break;
-
-default:
-sReturn.append(rString[i]);
-break;
-}
-}
-}
-return sReturn.makeStringAndClear();
-}
-
-} // anonymous namespace
-
 //
 // class CfgStackData
 //
@@ -558,7 +503,7 @@ void CfgMerge::WorkOnText(rtl::OString rText, const 
rtl::OString rLangIndex)
 if ( !rLangIndex.equalsIgnoreAsciiCase(en-US) 
 ( sContent != - )  !sContent.isEmpty())
 {
-rText = lcl_QuoteHTML( rText );
+rText = helper::QuotHTML( rText );
 }
 }
 }
@@ -590,7 +535,7 @@ void CfgMerge::WorkOnResourceEnd()
 ( sContent != - )  !sContent.isEmpty())
 {
 
-rtl::OString sText = lcl_QuoteHTML( sContent);
+rtl::OString sText = helper::QuotHTML( sContent);
 
 rtl::OString sAdditionalLine( \t );
 
diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx
index 08a2560..69163d0 100644
--- a/l10ntools/source/helper.cxx
+++ b/l10ntools/source/helper.cxx
@@ -27,6 +27,9 @@ OString QuotHTML(const OString rString)
 case '':
 sReturn.append(quot;);
 break;
+case '\'':
+sReturn.append(apos;);
+break;
 case '':
 if (rString.match(amp;, i))
 sReturn.append('');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Zolnai Tamás]

 dbaccess/source/ui/querydesign/LimitBox.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 6c6adf5b46ce52b6d1ada11c0ddc03cedb675e88
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Wed Mar 27 14:26:32 2013 +0100

fdo#61794 Set maximum of LimitBox to SAL_MAX_INT64

Change-Id: I1744c7f8f1d6d27d3e62feb0cade1280fea331f1

diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx 
b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 3a25f40..9556f81 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -37,9 +37,7 @@ LimitBox::LimitBox( Window* pParent, WinBits nStyle )
 SetShowTrailingZeros( sal_False );
 SetDecimalDigits( 0 );
 SetMin( -1 );
-
-///Use the maximum value of Int32
-SetMax( 2147483647 );
+SetMax( SAL_MAX_INT64 );
 LoadDefaultLimits();
 
 Size aSize(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source sw/source

[Zolnai Tamás]

 sd/source/ui/app/toolbox.src   |1 -
 sw/source/ui/shells/shells.src |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6b01598089547d61e29199a1e3f15f5e39bf88bc
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Wed Mar 27 18:50:18 2013 +0100

Delete German src strings

Change-Id: Iec1def690a94c7917b6983cb6a12fb953e89eb34

diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src
index 480ddda..e794388 100644
--- a/sd/source/ui/app/toolbox.src
+++ b/sd/source/ui/app/toolbox.src
@@ -38,7 +38,6 @@ String RID_DRAW_MEDIA_TOOLBOX
 
 String RID_DRAW_TABLE_TOOLBOX
 {
-TEXT [ de ] = Tabelle ;
 Text [ en-US ] = Table ;
 };
 
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index ddf4b61..89e3c6d 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -244,6 +244,6 @@ String STR_SWBG_FOOTER
  //Ende: Strings fuer Gallery/Hintergrund
 
 // #i68101# no longer needed:
-// String STR_NAME_SHAPE_LABEL {// String STR_NAME_SHAPE_DIALOG { Text [ de ] 
= Objekt benennen ; Text [ en-US ] = Name Object; };
+// String STR_NAME_SHAPE_LABEL {// String STR_NAME_SHAPE_DIALOG { Text [ en-US 
] = Name Object; };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/common.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d7e6a24f160dc0de94f681fb6c88a0a287cebb41
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Wed Mar 27 21:37:36 2013 +0100

Fix build: typo and not need

Change-Id: I7bc1ee815e6ac333fb0c5b9a2c3135db2f81235e

diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index 3530211..304f44c 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -8,7 +8,6 @@
  */
 
 #include common.hxx
-#include po.cxx
 
 //flags for handleArguments()
 #define STATE_NON   0x0001
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/source

[Zolnai Tamás]

 vcl/inc/vcl/field.hxx|2 -
 vcl/source/control/field.cxx |   80 +++
 2 files changed, 45 insertions(+), 37 deletions(-)

New commits:
commit 84bac1799e528272ca808240508ca3f66272ee13
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Mon Mar 25 13:02:01 2013 +0100

Kill double conversion from NumericBox

Change-Id: Id1161c40725f75ea0d7ec3f15a19ca14defd0a75
Reviewed-on: https://gerrit.libreoffice.org/3035
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index ec661c6..50888c6 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -170,7 +170,7 @@ protected:
 voidFieldLast();
 
 SAL_DLLPRIVATE void ImplLoadRes( const ResId rResId );
-SAL_DLLPRIVATE sal_Bool ImplNumericReformat( const OUString rStr, double 
rValue, OUString rOutStr );
+SAL_DLLPRIVATE sal_Bool ImplNumericReformat( const OUString rStr, 
sal_Int64 rValue, OUString rOutStr );
 SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue );
 SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection* 
pNewSelection = NULL );
 
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 69cb02e..3dead80 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -89,7 +89,7 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const 
KeyEvent rKEvt,
 
 // ---
 
-static sal_Bool ImplNumericGetValue( const OUString rStr, double rValue,
+static sal_Bool ImplNumericGetValue( const OUString rStr, sal_Int64 rValue,
  sal_uInt16 nDecDigits, const 
LocaleDataWrapper rLocaleDataWrappper,
  sal_Bool bCurrency = sal_False )
 {
@@ -196,7 +196,19 @@ static sal_Bool ImplNumericGetValue( const OUString rStr, 
double rValue,
 aStr  = aStr1.makeStringAndClear() + aStr2.makeStringAndClear();
 
 // check range
-double nValue = rtl::OUString(aStr).toDouble();
+sal_Int64 nValue = aStr.toInt64();
+if( nValue == 0 )
+{
+// check if string is equivalent to zero
+sal_Int16 nIndex = bNegative ? 1 : 0;
+while( aStr[nIndex] == '0'  nIndex  aStr.getLength() )
+++nIndex;
+if( nIndex  aStr.getLength() )
+{
+rValue = bNegative ? SAL_MIN_INT64 : SAL_MAX_INT64;
+return sal_True;
+}
+}
 if (bRound)
 {
 if ( !bNegative )
@@ -428,23 +440,22 @@ sal_Bool FormatterBase::IsEmptyFieldValue() const
 
 // ---
 
-sal_Bool NumericFormatter::ImplNumericReformat( const OUString rStr, double 
rValue,
+sal_Bool NumericFormatter::ImplNumericReformat( const OUString rStr, 
sal_Int64 rValue,
 OUString rOutStr )
 {
 if ( !ImplNumericGetValue( rStr, rValue, GetDecimalDigits(), 
ImplGetLocaleDataWrapper() ) )
 return sal_True;
 else
 {
-double nTempVal = rValue;
-// caution: precision loss in double cast
+sal_Int64 nTempVal = rValue;
 if ( nTempVal  mnMax )
-nTempVal = (double)mnMax;
+nTempVal = mnMax;
 else if ( nTempVal  mnMin )
-nTempVal = (double)mnMin;
+nTempVal = mnMin;
 
 if ( GetErrorHdl().IsSet()  (rValue != nTempVal) )
 {
-mnCorrectedValue = (sal_Int64)nTempVal;
+mnCorrectedValue = nTempVal;
 if ( !GetErrorHdl().Call( this ) )
 {
 mnCorrectedValue = 0;
@@ -454,7 +465,7 @@ sal_Bool NumericFormatter::ImplNumericReformat( const 
OUString rStr, double rV
 mnCorrectedValue = 0;
 }
 
-rOutStr = CreateFieldText( (sal_Int64)nTempVal );
+rOutStr = CreateFieldText( nTempVal );
 return sal_True;
 }
 }
@@ -627,17 +638,16 @@ sal_Int64 NumericFormatter::GetValue() const
 if ( !GetField() )
 return 0;
 
-double nTempValue;
+sal_Int64 nTempValue;
 
 if ( ImplNumericGetValue( GetField()-GetText(), nTempValue,
   GetDecimalDigits(), ImplGetLocaleDataWrapper() ) 
)
 {
-// caution: precision loss in double cast
 if ( nTempValue  mnMax )
-nTempValue = (double)mnMax;
+nTempValue = mnMax;
 else if ( nTempValue  mnMin )
-nTempValue = (double)mnMin;
-return (sal_Int64)nTempValue;
+nTempValue = mnMin;
+return nTempValue;
 }
 else
 return mnLastValue;
@@ -690,10 +700,9 @@ void NumericFormatter::Reformat()
 return;
 
 OUString aStr;
-// caution: precision loss in double cast
-double nTemp = (double)mnLastValue;
+sal_Int64 nTemp = mnLastValue;
 

[Libreoffice-commits] core.git: crashrep/CustomTarget_crashrep_res.mk instsetoo_native/CustomTarget_install.mk l10ntools/inc l10ntools/source librelogo/CustomTarget_librelogo.mk readlicense_oo/CustomT

[Zolnai Tamás]

 crashrep/CustomTarget_crashrep_res.mk|2 -
 instsetoo_native/CustomTarget_install.mk |2 -
 l10ntools/inc/cfgmerge.hxx   |   12 +++---
 l10ntools/inc/export.hxx |   12 +-
 l10ntools/inc/helpmerge.hxx  |4 +-
 l10ntools/inc/lngmerge.hxx   |6 +--
 l10ntools/inc/xrmmerge.hxx   |6 +--
 l10ntools/source/cfgmerge.cxx|   33 +++---
 l10ntools/source/export.cxx  |   11 +-
 l10ntools/source/export2.cxx |   34 +++
 l10ntools/source/helpex.cxx  |   15 +++-
 l10ntools/source/helpmerge.cxx   |   10 ++---
 l10ntools/source/lngex.cxx   |7 ++-
 l10ntools/source/lngmerge.cxx|   20 +--
 l10ntools/source/localize.cxx|   45 +++--
 l10ntools/source/propex.cxx  |4 +-
 l10ntools/source/stringex.cxx|   44 +++-
 l10ntools/source/treex.cxx   |   55 +++
 l10ntools/source/uimerge.cxx |   31 +++--
 l10ntools/source/xrmmerge.cxx|   36 
 librelogo/CustomTarget_librelogo.mk  |1 
 readlicense_oo/CustomTarget_readme.mk|1 
 setup_native/CustomTarget_mac.mk |2 -
 shell/CustomTarget_shlxthdl_res.mk   |2 -
 solenv/gbuild/AllLangResTarget.mk|1 
 solenv/gbuild/Configuration.mk   |1 
 solenv/gbuild/ExtensionTarget.mk |2 -
 solenv/gbuild/InstallModuleTarget.mk |2 -
 sysui/CustomTarget_share.mk  |2 -
 29 files changed, 159 insertions(+), 244 deletions(-)

New commits:
commit 56a52889e65a17e324fc10cf341690385f5a9dd9
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Mon Mar 25 11:57:39 2013 +0100

Remove unneeded project and projectroot parameters

Plus avoid use of Export::sLanguages member outside
of the class.

Change-Id: I33702816fdb4980d690cfe8fcd8cc3fbd0df1dd8

diff --git a/crashrep/CustomTarget_crashrep_res.mk 
b/crashrep/CustomTarget_crashrep_res.mk
index c64f4cb..be6c688 100644
--- a/crashrep/CustomTarget_crashrep_res.mk
+++ b/crashrep/CustomTarget_crashrep_res.mk
@@ -38,7 +38,7 @@ $(call 
gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf : \
$(call gb_Executable_get_runtime_dependencies,ulfex)
MERGEINPUT=`$(gb_MKTEMP)`  \
echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $))).po)  $${MERGEINPUT}  \
-   $(call gb_Executable_get_command,ulfex) -p crashrep -i $ -o $@ -m 
$${MERGEINPUT} -l all  \
+   $(call gb_Executable_get_command,ulfex) -i $ -o $@ -m $${MERGEINPUT} 
-l all  \
rm -f $${MERGEINPUT}
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 0087239..ca3f2de 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -44,7 +44,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf:
MERGEINPUT=`$(gb_MKTEMP)`  \
echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po)
  $${MERGEINPUT}  \
$(call gb_Helper_abbreviate_dirs,\
-   $(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $ -o $@ 
-m $${MERGEINPUT} -l all )  \
+   $(call gb_Executable_get_command,ulfex) -i $ -o $@ -m $${MERGEINPUT} 
-l all )  \
rm -rf $${MERGEINPUT}
 else
 $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 0598728..bbe68eb 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -144,7 +144,6 @@ public:
 class CfgExport : public CfgParser
 {
 private:
-rtl::OString sPrj;
 rtl::OString sPath;
 std::vectorrtl::OString aLanguages;
 
@@ -160,9 +159,9 @@ protected:
 void Output(const rtl::OString rOutput);
 public:
 CfgExport(
-const rtl::OString rOutputFile,
-const rtl::OString rProject,
-const rtl::OString rFilePath
+const OString rOutputFile,
+const OString rFilePath,
+const OString rLanguage
 );
 ~CfgExport();
 };
@@ -190,8 +189,9 @@ protected:
 
 void Output(const rtl::OString rOutput);
 public:
-CfgMerge(const rtl::OString rMergeSource,
-const rtl::OString rOutputFile, const rtl::OString rFilename);
+CfgMerge(
+const OString rMergeSource, const OString rOutputFile,
+const OString rFilename, const OString rLanguage );
 ~CfgMerge();
 };
 
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 564e877..fbe7ada 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -247,20 +247,16 @@ 

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

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

New commits:
commit 843b7b614eaf624fcc19535e5d444bb40bc382be
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sun Mar 24 01:07:51 2013 +0100

qtz length changed, use this length dynamically

Change-Id: I2935ff0c1114f1b3e690fd6f86441a180566fd32

diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 001ff83..3658044 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -249,7 +249,7 @@ sal_Bool LngParser::Merge(
 rtl::OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, 
sLang, sal_True );
 if( sLang == qtz )
-sNewText = sNewText.copy(6);
+sNewText = sNewText.copy(sNewText.indexOf(|) 
+ 2);
 
 if ( !sNewText.isEmpty()) {
 rtl::OString *pLine = (*pLines)[ nPos ];
@@ -287,7 +287,7 @@ sal_Bool LngParser::Merge(
 rtl::OString sNewText;
 pEntrys-GetText( sNewText, STRING_TYP_TEXT, sCur, 
sal_True );
 if( sCur == qtz )
-sNewText = sNewText.copy(6);
+sNewText = sNewText.copy(sNewText.indexOf(|) + 2);
 if (( !sNewText.isEmpty()) 
 !(( 
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM(x-comment)))  ( sNewText == - )))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

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

New commits:
commit 0552b4334c2fb6b130ec05934b952b60418aadca
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu Mar 21 17:20:38 2013 +0100

Check return value of system()

Change-Id: I1b9e31b8c64ed8bf7eb073f036a7fdda39a15392

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index b608ee0..b19521a 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -284,7 +284,13 @@ void handleFilesOfDir(
 aPOStream.close();
 if( bDel )
 {
-system(OString(rm  + sPotFile).getStr());
+if ( system(OString(rm  + sPotFile).getStr()) != 0 )
+{
+cerr
+ Error: Cannot remove entryless pot file: 
+ sPotFile.getStr()  \n;
+throw false; //TODO
+}
 }
 }
 //Remove empty pot directories
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build failure on master with Linux 32 bit in localize.cxx

[Zolnai Tamás]

Hi Alex,

As of last night, I'm now getting a build failure in localize.cxx with
 my build from master, both on make dev-install, and after make clean/make :


Thanks for your notice.
The problem has been solved with this commit:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0552b4334c2fb6b130ec05934b952b60418aadca

Best regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: NumericBox unsafe double conversion

[Zolnai Tamás]

Hi Kendy,

 Yes, I give it a try.

 Great, thanks a lot! :-)


Well, I said I'm interested in this cleanup, but just until it is not too
far from my tasks. :)
I used NumericBox to derive from it while implementing LimitBox and I'd
like to allow the user adding values unlimitedly, so the only limit would
be the maximum value of the used type (in this case sal_Int64). (Anyway, I
think such maximum value for a NumericBox is a rare case. Maybe that's why
this bug dont outcrop yet) So I'm interested only in NumericBox, and I
would do my changes only in it with taking care not to change others
behaviour.

Plus, as I see there are not only multiplication in ConvertDoubleValue, but
division too. Replace these simply with integer division will not result
the same. So that make this situation more difficult to solve only with
integer operations and avoid all double aritmetic. So yes, its getting
complicated, too complicated.

Otherwise in ImplNumericGetValue() the problem of overflow/underflow can be
avoid with these lines
sal_Int64 nValue = aStr.toInt64()
if( OUString::valueOf(nValue) != aStr )
{
if( bNegative )
rValue = SAL_MIN_INT64;
else
rValue = SAL_MAX_INT64;
return sal_True;
}
With this the bevavior would be the excepted, because NumericBox and others
were made to return the maximum value (mnMax, GetMax()) when the typed one
is bigger. (mnMin just the same)

So, I try to solve the problem of NumericBox, but MetricBox remain the
same. Maybe an other day or an other man. :)

Best regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: NumericBox unsafe double conversion

[Zolnai Tamás]

2013/3/22 Stephan Bergmann sberg...@redhat.com

 On 03/22/2013 11:44 AM, Zolnai Tamás wrote:

 Otherwise in ImplNumericGetValue() the problem of overflow/underflow can
 be avoid with these lines
 sal_Int64 nValue = aStr.toInt64()
 if( OUString::valueOf(nValue) != aStr )
 {
  if( bNegative )
  rValue = SAL_MIN_INT64;
  else
  rValue = SAL_MAX_INT64;
  return sal_True;
 }


 ...but only if aStr is known to be in canonical form, esp. neither
 contains minus zero nor contains excessive leading zero digits.  None of
 that is guaranteed for ImplNumericGetValue in its current form (and also
 consider nDecDigits  0, where input rStr=0 and nDecDigits=2, say, would
 lead to aStr=000 and the above comparison erroneously failing).


Oh, that's true. Thanks. I extend the check to take notice of these two
things.
From that matter, why is that the toInt64() function doesn't pay attention
on overflow/underflow? Maybe it would simpler to handle these flows in
that function.


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

Re: NumericBox unsafe double conversion

[Zolnai Tamás]

Hi Kendy,

2013/3/20 Jan Holesovsky ke...@suse.cz

 Hi Tamás,

 Zolnai Tamás píše v Po 18. 03. 2013 v 17:56 +0100:


  And the problem was found in this function, in line 199:
  double nValue = rtl::OUString(aStr).toDouble();
 
 
  In general the NumericBox store its data in an sal_Int64 variable, but
  here this OUString-double conversion cause changes in big numbers.
  The aStr variable comes from GetText() function, which gives the
  NumericBox's content, so it is a string representation of an sal_Int64
  value. I don't know this behaviour is the expected from the
  OUString::toDouble() function, or it is a bug.

 Terribly sorry for my late answer.  I read the code there, and I'd just
 kill the double from the code that is there (ie. from all the methods
 that call ImplNumericGetValue() etc.), and instead of
 OUString::toDouble() used OUString::toInt64().

 The logic of ImplNumericGetValue() is that it splits the number to part
 in front of the decimal point/comma, and after that, creates one
 sal_Int64 number from that, and converts that to double.  Nevertheless,
 later it is converted back to sal_Int64.  If the conversion to double
 was there to avoid some overflows, the value will overflow anyway as
 soon as you try to convert it back; but of course, you should be careful
 when doing your changes, mostly in the area of conversions that include
 multiplication.


Yes, I give it a try. I think the mentioned multiplication is
in MetricField::ConvertDoubleValue(), which not need to change, as I see.
I think three function would be changed:
ImplNumericGetValue(), ImplMetricGetValue(), ImplCurrencyGetValue()
The out parameter of these funcitons would be sal_Int64 instead of double.
In ImplMetricGetValue() usage of MetricField::ConvertDoubleValue() would be
changed only with little things.
Call it with (double)rValue as its first parameter and cast its return
value to sal_Int64.
So I make it in this way, and will see wheather it solves the problem.

Best regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/localize.cxx |  109 ++
 1 file changed, 69 insertions(+), 40 deletions(-)

New commits:
commit ccaeb1c27521fe2d95f7e12d02843613b8ad1649
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Tue Mar 19 17:06:45 2013 +0100

Localize files of a directory in lexical order

To avoid big diffs, stem from platform dependent order.

Change-Id: I848a14de2c4e7af2f3a2d9a0fdb005c289cfead2

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index e0c22f7..b608ee0 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -23,6 +23,8 @@
 #include cstdlib
 #include iostream
 #include string
+#include vector
+#include algorithm
 
 #include osl/file.h
 #include osl/file.hxx
@@ -252,6 +254,54 @@ bool handleFile(
 return false;
 }
 
+void handleFilesOfDir(
+std::vectorOUString aFiles, const OString rProject,
+const OString rProjectRoot, const OString rPotDir )
+{
+///Handle files in lexical order
+std::sort(aFiles.begin(), aFiles.end());
+
+typedef std::vectorOUString::const_iterator citer_t;
+
+bool bFirstLocFile = true; /// First file in directory which needs 
localization
+
+for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt )
+{
+if (handleFile( rProject, rProjectRoot, *aIt, rPotDir, bFirstLocFile))
+{
+bFirstLocFile = false;
+}
+}
+
+if( !bFirstLocFile )
+{
+//Delete pot file if it contain only the header
+OString sPotFile = rPotDir.concat(.pot);
+PoIfstream aPOStream( sPotFile );
+PoEntry aPO;
+aPOStream.readEntry( aPO );
+bool bDel = aPOStream.eof();
+aPOStream.close();
+if( bDel )
+{
+system(OString(rm  + sPotFile).getStr());
+}
+}
+//Remove empty pot directories
+OUString sPoPath =
+OStringToOUString(
+rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
+OUString sPoUrl;
+if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
+!= osl::FileBase::E_None)
+{
+cerr  Error: Cannot convert pathname to URL in   __FILE__  , 
in line   __LINE__  \n
+  OUStringToOString(sPoPath, RTL_TEXTENCODING_UTF8).getStr()  
\n;
+throw false; //TODO
+}
+osl::Directory::remove(sPoUrl);
+}
+
 bool includeProject(const OString rProject) {
 static OString projects[] = {
 accessibility,
@@ -338,7 +388,7 @@ void handleDirectory(
  Error: Cannot open directory:   rUrl  '\n';
 throw false; //TODO
 }
-bool bFirstLocFile = true;
+std::vectorOUString aFileNames;
 for (;;) {
 osl::DirectoryItem item;
 osl::FileBase::RC e = dir.getNextItem(item);
@@ -356,7 +406,7 @@ void handleDirectory(
 cerr  Error: Cannot get file status\n;
 throw false; //TODO
 }
-const OString sFileName =
+const OString sDirName =
 OUStringToOString(stat.getFileName(),RTL_TEXTENCODING_UTF8);
 switch (nLevel) {
 case -1: // the clone or src directory
@@ -368,12 +418,12 @@ void handleDirectory(
 break;
 case 0: // a root directory
 if (stat.getFileType() == osl::FileStatus::Directory) {
-if (includeProject(sFileName)) {
+if (includeProject(sDirName)) {
 handleDirectory(
-stat.getFileURL(), 1, sFileName,
-OString(), rPotDir.concat(/).concat(sFileName));
-} else if ( sFileName == clone ||
-sFileName == src )
+stat.getFileURL(), 1, sDirName,
+OString(), rPotDir.concat(/).concat(sDirName));
+} else if ( sDirName == clone ||
+sDirName == src )
 {
 handleDirectory(
 stat.getFileURL(), -1, OString(), OString(), rPotDir);
@@ -381,54 +431,33 @@ void handleDirectory(
 }
 break;
 default:
-if (stat.getFileType() == osl::FileStatus::Directory) {
+if (stat.getFileType() == osl::FileStatus::Directory)
+{
 OString pr(rProjectRoot);
 if (!pr.isEmpty()) {
 pr += OString('/');
 }
 pr += OString(..);
 handleDirectory(
-stat.getFileURL(), 2, rProject, pr, 
rPotDir.concat(/).concat(sFileName));
-} else {
-if( handleFile( rProject, rProjectRoot, stat.getFileURL(),
-rPotDir, bFirstLocFile) )
-bFirstLocFile = false;
+stat.getFileURL(), 2, rProject, pr, 
rPotDir.concat(/).concat(sDirName));
+}
+else
+{
+

[Libreoffice-commits] core.git: dictionaries

[Zolnai Tamás]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33f39ca2826d09767078cc6f47b0cb572edb1f61
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 16 11:26:04 2013 +0100

Updated core
Project: dictionaries  26b7c425b0cecaad38249bfdc17b8d5cecee2670

diff --git a/dictionaries b/dictionaries
index 7e42390..26b7c42 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7e4239060266bf238b5e6692ed10d548c37572d5
+Subproject commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: pt_BR/description.xml

[Zolnai Tamás]

 pt_BR/description.xml |  107 --
 1 file changed, 107 deletions(-)

New commits:
commit 26b7c425b0cecaad38249bfdc17b8d5cecee2670
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 16 11:26:04 2013 +0100

Localization works only with en-US entries

String of other languages are in po files

Change-Id: Iebf5de3f45a166e1a0e35aae3c8aa7820483a94f

diff --git a/pt_BR/description.xml b/pt_BR/description.xml
index bdb44c3..01b453f 100644
--- a/pt_BR/description.xml
+++ b/pt_BR/description.xml
@@ -4,113 +4,6 @@
 identifier 
value=brazilian.portuguese.reform1990-dictionary.from.vero.by.raimundomoura /
 display-name
 name lang=en-USSpelling, hyphenation and grammar checking tools 
for Brazilian Portuguese/name
-name lang=afSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=arSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=asSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=astDiccionariu ortográficu, regles de separtación 
silábica pal portugués de Brasil (normes ortográfiques de 1990)/name
-name lang=beПартугальскі (Бразілія) 
правапісны слоўнік (правілы 1990 года) і 
правілы пераносаў/name
-name lang=bgПортугалски речници за 
правопис (договор от 1990 г.) и 
сричкопренасяне (Бразилия)/name
-name lang=bnSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=boSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=brGeriadur ar reizhskrivañ (emglev 1990) ha reolennoù 
an troc'hañ-gerioù evit ar portugaleg braziliat/name
-name lang=brxSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=bsSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=caDiccionari ortogràfic (normes ortogràfiques de 1990) 
i regles de separació sil·làbica per al portuguès de Brasil/name
-name lang=ca-XVSpelling, hyphenation and grammar checking tools 
for Brazilian Portuguese/name
-name lang=csPortugalský (brazilský) slovník pro kontrolu 
pravopisu (dle dohody z roku 1990) a dělení slov/name
-name lang=cyPortiwgaleg Brasil - Geiriadur sillafu (Cytundeb 
Sillafu 1990), a rheolau cyplysnodi/name
-name lang=daBrasiliansk portugisisk stavekontrol (1990 
staveregler) og orddelingsregler/name
-name lang=deBrasilianisch Portugiesisches Wörterbuch für 
Rechtschreibprüfung (Rechtschreibregelung von 1990) und Silbentrennung/name
-name lang=dgoSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=dzSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=elΒραζιλιάνικο πορτογαλικό 
ορθογραφικό λεξικό (ορθογραφική συμφωνία 
1990) και συλλαβισμός/name
-name lang=en-GBSpelling, hyphenation and grammar checking tools 
for Brazilian Portuguese/name
-name lang=en-ZASpelling, hyphenation and grammar checking tools 
for Brazilian Portuguese/name
-name lang=eoBrazile portugala ortografia vortaro (1990 Ortografia 
Interkonsento), kaj vortdividaj reguloj/name
-name lang=esSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=etBrasiilia portugali keele õigekirjakontrolli (1990. a 
õigekirjutuskokkuleppe) sõnastik ja poolitusreeglid/name
-name lang=euSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=faSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=fiBrasilian portugalin oikolukusanasto (1990 sovittu 
kirjoitusasu) ja tavutussäännöt/name
-name lang=frDictionnaires orthographique (agrément d'orthographe 
1990) et règles de coupure des mots portugais brésiliens/name
-name lang=gaFoclóir Litrithe Phortaingéilis na Brasaíle 
(Comhaontú Litrithe 1990), agus rialacha fleiscínithe/name
-name lang=gdFaclair litreachaidh is riaghailtean tàthanachaidh 
airson Portagailis Bhraisil (Aonta Litreachaidh 1990)/name
-name lang=glCorrector ortográfico e guionizador do portugués do 
Brasil (Acordo ortográfico do 1990)/name
-name lang=guSpelling, hyphenation and grammar checking tools for 
Brazilian Portuguese/name
-name lang=heרשימת מילים לבודק איות (הסכם 
בדיקת איות מ־1990) וכללי מיקוף בפורטוגזית 
ברזילאית/name
-name lang=hiSpelling, hyphenation and grammar 

[Libreoffice-commits] core.git: desktop/test

[Zolnai Tamás]

 desktop/test/deployment/update/website_update/update/web6/description.xml |
2 +-
 desktop/test/deployment/update/website_update/update/web7/description.xml |
2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ae470fd0205d8c28bf06c611026244f4c13ce09
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 16 12:33:36 2013 +0100

Make some xml entries localizable

Localization works only with en-US entries,
others are ignored

Change-Id: Iad8e82bf14535c98f311a8b6c2a94d6aeb1b1af9

diff --git 
a/desktop/test/deployment/update/website_update/update/web6/description.xml 
b/desktop/test/deployment/update/website_update/update/web6/description.xml
index 1d85a98..a800d64 100644
--- a/desktop/test/deployment/update/website_update/update/web6/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web6/description.xml
@@ -21,7 +21,7 @@
 version value=2.0 /
 identifier 
value=org.openoffice/framework/desktop/test/deployment/update/website_update/web6/
 display-name
-  name lang=enweb-based update test 1/name
+  name lang=en-USweb-based update test 1/name
 /display-name
 
 /description
diff --git 
a/desktop/test/deployment/update/website_update/update/web7/description.xml 
b/desktop/test/deployment/update/website_update/update/web7/description.xml
index c1c6c41..fc5f40f 100644
--- a/desktop/test/deployment/update/website_update/update/web7/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web7/description.xml
@@ -21,7 +21,7 @@
 version value=2.0 /
 identifier 
value=org.openoffice/framework/desktop/test/deployment/update/website_update/web7/
 display-name
-  name lang=enweb-based update test 1/name
+  name lang=en-USweb-based update test 1/name
 /display-name
 
 publisher
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

NumericBox unsafe double conversion

[Zolnai Tamás]

Hi All,
.
  I'm working with NumericBox nowadays and I recognised a problem belong to
it. This class is a ComboBox which allows only numeric values. It use
sal_Int64 for store its value but use double conversion internal for
remformating. The problem is that this concept allows adding such sal_Int64
value which too large (contain too many digits?) so double conversion
changes it in undefined way.
For example: 92 233 720 368 547 750  change to 92 233 720 368 547 744 on my
system.
Maybe using sal_Int32 can solve this problem.

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

[Libreoffice-commits] core.git: vcl/source

[Zolnai Tamás]

 vcl/source/control/combobox.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3a31375528ad3d9fc49f5ab3982e96c9e46fa7af
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 10:43:40 2013 +0100

Make ComboBox::CalcSize to return the right width

Change-Id: I83f5075281b2edd3f7a5e94709f0529d0c744ff8
Reviewed-on: https://gerrit.libreoffice.org/2612
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 1c99ac2..cc82820 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1146,6 +1146,8 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 
nLines ) const
 aSz.Width() += GetSettings().GetStyleSettings().GetScrollBarSize();
 }
 
+aSz.Width() += ImplGetExtraOffset() * 2;
+
 aSz = CalcWindowSize( aSz );
 return aSz;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Zolnai Tamás]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 065415b43d6ef4a5f06076861b67836f0f378c5c
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Mon Mar 11 14:12:06 2013 +0100

Updated core
Project: help  1c7b7c25446258b819ad5df2c157b78425058b26

diff --git a/helpcontent2 b/helpcontent2
index 4337668..1c7b7c2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4337668c56b83d04649591820d2fb243537b7dad
+Subproject commit 1c7b7c25446258b819ad5df2c157b78425058b26
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig

[Zolnai Tamás]

 dbaccess/source/ui/querydesign/LimitBox.cxx   |7 ---
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |2 +-
 dbaccess/uiconfig/ui/querypropertiesdialog.ui |2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 4c52c8bd73bb814a87df2c032faa164f21f9f73e
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 11:41:54 2013 +0100

fdo#61794 Allow greater value in LimitBox

Increase the width of LimitBox
*on toolbar: 6 digits
*in dialog: 10 digits
Set maximum value of LimitBox to the max value of Int32

Change-Id: I6fcf0270b474eb46a29ff98ade9cd7ee8ba637f5

diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx 
b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 36fb191..735bfa8 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -42,7 +42,9 @@ LimitBox::LimitBox( Window* pParent, WinBits nStyle )
 SetShowTrailingZeros( sal_False );
 SetDecimalDigits( 0 );
 SetMin( -1 );
-SetMax(  );
+
+///Use the maximum value of Int32
+SetMax( 2147483647 );
 LoadDefaultLimits();
 
 Size aSize(
@@ -100,8 +102,7 @@ void LimitBox::ReformatAll()
 
 Size LimitBox::GetOptimalSize() const
 {
-Size aSize = NumericBox::GetOptimalSize();
-return Size( aSize.Width() + 20, aSize.Height());
+return CalcSize(10,1);
 }
 
 ///Initialize entries
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx 
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index e49dfbc..e56f3b3 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -193,7 +193,7 @@ uno::Reference awt::XWindow  SAL_CALL 
LimitBoxController::createItemWindow(
 {
 SolarMutexGuard aSolarMutexGuard;
 m_pLimitBox = new LimitBoxImpl(pParent, this);
-m_pLimitBox-SetSizePixel(m_pLimitBox-GetOptimalSize());
+m_pLimitBox-SetSizePixel(m_pLimitBox-CalcSize(6,1));
 xItemWindow = VCLUnoHelper::GetInterface( m_pLimitBox );
 }
 
diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui 
b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index d745c16..6f55af2 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
@@ -168,7 +168,7 @@
   object class=GtkGrid id=grid3
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=column_spacing12/property
+property name=column_spacing24/property
 child
   object class=GtkLabel id=limit-label
 property name=visibleTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Zolnai Tamás]

 dbaccess/source/ui/querydesign/LimitBox.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 4e38ea86701bdefcf31c6f9e3136d1eda4e5c061
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 12:02:25 2013 +0100

LimitBox.cxx: Delete useless comment block

Change-Id: I3a75c7de783913385188680119f2baf8a726676d

diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx 
b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 735bfa8..3a25f40 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -14,11 +14,6 @@
 #define ALL_STRING ModuleRes(STR_QUERY_LIMIT_ALL).toString()
 #define ALL_INT -1
 
-
-
-///LimitBox
-
-
 namespace global{
 
 /// Default values
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Zolnai Tamás]

 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 8885dc27da82f83d27eb99f8bea4abb5e450fce3
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 12:10:22 2013 +0100

Make allow to step on from LimitBox with tab

Change-Id: I5f2994459cbb7786e6c9d83b0894cb581f4560fd

diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx 
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index e56f3b3..3804f86 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -77,6 +77,11 @@ long LimitBoxImpl::Notify( NotifyEvent rNEvt )
 nHandled = 1;
 break;
 }
+case KEY_TAB:
+{
+Select();
+break;
+}
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/po.hxx|1 -
 l10ntools/source/po.cxx |   36 
 2 files changed, 37 deletions(-)

New commits:
commit de69091d34d8102c0b56194d603ed9e66699d34c
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 12:18:28 2013 +0100

Delete PoHeader constructor used by renewpo

Change-Id: I360a9c96eacf9b7b8bd80214a3fc4c9faa01e631

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
old mode 100644
new mode 100755
index 506558f..f2edb06
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -90,7 +90,6 @@ public:
 friend class PoIfstream;
 
 PoHeader( const OString rExtSrc );
-PoHeader( std::ifstream rOldPo );
 ~PoHeader();
 };
 
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
old mode 100644
new mode 100755
index 90b7f79..99e113b
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -619,16 +619,6 @@ namespace
 strftime( pBuff, sizeof pBuff, %Y-%m-%d %H:%M%z, pNow );
 return pBuff;
 }
-
-static OString lcl_ReplaceAttribute(
-const OString rSource, const OString rOld, const OString rNew )
-{
-const sal_Int32 nFirstIndex =
-rSource.indexOf( rOld ) + rOld.getLength()+2;
-const sal_Int32 nCount =
-rSource.indexOf( \n, nFirstIndex ) - nFirstIndex;
-return rSource.replaceFirst( rSource.copy(nFirstIndex, nCount), rNew );
-}
 }
 
 //Template Constructor
@@ -653,32 +643,6 @@ PoHeader::PoHeader( const OString rExtSrc )
 m_bIsInitialized = true;
 }
 
-
-//Constructor for old headers to renew po files
-PoHeader::PoHeader(  std::ifstream rOldPo )
-: m_pGenPo( new GenPoEntry() )
-, m_bIsInitialized( false )
-{
-assert( rOldPo.is_open() );
-m_pGenPo-readFromFile( rOldPo );
-
-const OString sExtractCom = m_pGenPo-getExtractCom();
-m_pGenPo-setExtractCom(
-sExtractCom.copy( 0, sExtractCom.getLength() - 3 ) );
-
-OString sMsgStr = m_pGenPo-getMsgStr();
-sMsgStr =
-lcl_ReplaceAttribute( sMsgStr, Report-Msgid-Bugs-To,
-https://bugs.freedesktop.org/enter_bug.cgi?product=;
-LibreOfficebug_status=UNCONFIRMEDcomponent=UI );
-sMsgStr =
-lcl_ReplaceAttribute( sMsgStr, X-Generator, LibreOffice );
-sMsgStr =
-lcl_ReplaceAttribute( sMsgStr, X-Accelerator-Marker, ~ );
-m_pGenPo-setMsgStr( sMsgStr );
-m_bIsInitialized = true;
-}
-
 PoHeader::~PoHeader()
 {
 delete m_pGenPo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

 l10ntools/source/localize.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d4c13acaabd37dd9a7026881bc69e0fa64524536
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 12:48:00 2013 +0100

not stop localize, just ignore invalid po entries

Change-Id: I8bd987ec0f2bd4a886a14d38d7b7ba354abd2f06

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index af61293..55dcda2 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -282,7 +282,6 @@ void handleCommand(
  's output is invalid:\n
  sLine.replaceAll(\t,\\t).getStr()
  endl;
-throw false; //TODO
 }
 }
 getline(in, s);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

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

New commits:
commit a18d1a107e49525efd1561f396f6b2be28ab5224
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Sat Mar 9 13:47:09 2013 +0100

Use simpler keyid with 5 digits

Change-Id: Iac743d4f298b43067fe5db9199eb39c3301f827e

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 99e113b..cdb5fb4 100755
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -264,16 +264,16 @@ namespace
 boost::crc_32_type aCRC32;
 aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength());
 sal_uInt32 nCRC = aCRC32.checksum();
-//Use all readable ASCII character exclude xml special tags: ,',,,
+///Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid 
confusing IDs
 static const OString sSymbols =
-
!#$%()*+,-./0123456789:;=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~;
-char sKeyId[5];
-for( short nKeyInd = 0; nKeyInd  4; ++nKeyInd )
+ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789;
+char sKeyId[6];
+for( short nKeyInd = 0; nKeyInd  5; ++nKeyInd )
 {
-sKeyId[nKeyInd] = sSymbols[(nCRC  255) % 89];
-nCRC = 8;
+sKeyId[nKeyInd] = sSymbols[(nCRC  63) % sSymbols.getLength()];
+nCRC = 6;
 }
-sKeyId[4] = '\0';
+sKeyId[5] = '\0';
 return OString(sKeyId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Zolnai Tamás]

 dbaccess/source/ui/inc/LimitBox.hxx   |2 -
 dbaccess/source/ui/querydesign/LimitBox.cxx   |   20 -
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx |   21 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

New commits:
commit 33933867b0e4488423ad35068d5a1ad673e9b4a3
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Fri Mar 8 10:39:56 2013 +0100

fdo#61797 ESCape abort changes and grab focus

Handling of hitting enter or escape are only
usefull for toolbar element.
In a dialog these keys have other meanings
(close the dialog with/without saving)

Change-Id: Ifbe5d36daab9c0702b888a58403dc170082fc32d

diff --git a/dbaccess/source/ui/inc/LimitBox.hxx 
b/dbaccess/source/ui/inc/LimitBox.hxx
index 52084a0..39584024 100644
--- a/dbaccess/source/ui/inc/LimitBox.hxx
+++ b/dbaccess/source/ui/inc/LimitBox.hxx
@@ -26,8 +26,6 @@ class LimitBox: public NumericBox
 LimitBox( Window* pParent, WinBits nStyle );
 virtual ~LimitBox();
 
-virtual longNotify( NotifyEvent rNEvt );
-
 virtual OUStringCreateFieldText( sal_Int64 nValue ) const;
 
 virtual voidReformat();
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx 
b/dbaccess/source/ui/querydesign/LimitBox.cxx
index a690826..36fb191 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -55,26 +55,6 @@ LimitBox::~LimitBox()
 {
 }
 
-long LimitBox::Notify( NotifyEvent rNEvt )
-{
-long nHandled = 0;
-
-switch ( rNEvt.GetType() )
-{
-case EVENT_KEYINPUT:
-{
-const sal_uInt16 nCode = 
rNEvt.GetKeyEvent()-GetKeyCode().GetCode();
-if( nCode == KEY_RETURN )
-{
-GrabFocusToDocument();
-nHandled = 1;
-}
-break;
-}
-}
-return nHandled ? nHandled : NumericBox::Notify( rNEvt );
-}
-
 OUString LimitBox::CreateFieldText( sal_Int64 nValue ) const
 {
 if( nValue == ALL_INT )
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx 
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 7697894..e49dfbc 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -51,6 +51,7 @@ LimitBoxImpl::~LimitBoxImpl()
 
 long LimitBoxImpl::Notify( NotifyEvent rNEvt )
 {
+long nHandled = 0;
 switch ( rNEvt.GetType() )
 {
 case EVENT_LOSEFOCUS:
@@ -61,8 +62,26 @@ long LimitBoxImpl::Notify( NotifyEvent rNEvt )
 m_pControl-dispatchCommand( aArgs );
 break;
 }
+case EVENT_KEYINPUT:
+{
+const sal_uInt16 nCode = 
rNEvt.GetKeyEvent()-GetKeyCode().GetCode();
+switch ( nCode )
+{
+case KEY_ESCAPE:
+{
+Undo();
+}
+case KEY_RETURN:
+{
+GrabFocusToDocument();
+nHandled = 1;
+break;
+}
+}
+break;
+}
 }
-return LimitBox::Notify( rNEvt );
+return nHandled ? nHandled : LimitBox::Notify( rNEvt );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Zolnai Tamás]

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

New commits:
commit 4aab4a879390c272cb95600156b4b14a7a29d6ea
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Mon Mar 4 11:51:06 2013 +0100

This condition is uneeded and cause localize not to work

See also: 73b7792f716064db0815ad0f86846093edcd2f78

Change-Id: I9ea5e77cf84ce9ac6b247b97e579373831ab9ab9

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index b935f9b..af61293 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -461,15 +461,13 @@ void handleDirectory(
 break;
 default:
 if (stat.getFileType() == osl::FileStatus::Directory) {
-if (level == 2) {
-OString pr(projectRoot);
-if (!pr.isEmpty()) {
-pr += OString('/');
-}
-pr += OString(..);
-handleDirectory(stat.getFileURL(), 2, project, pr,
-
actualPotDir.concat(/).concat(sFileName));
+OString pr(projectRoot);
+if (!pr.isEmpty()) {
+pr += OString('/');
 }
+pr += OString(..);
+handleDirectory(stat.getFileURL(), 2, project, pr,
+actualPotDir.concat(/).concat(sFileName));
 } else {
 handleFile(project, projectRoot,
stat.getFileURL(), actualPotDir, aPoOutPut);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/inc dbaccess/Library_dbu.mk dbaccess/Module_dbaccess.mk dbaccess/source dbaccess/uiconfig dbaccess/UI_dbaccess.mk extras/source officecfg/registry

[Zolnai Tamás]

 dbaccess/Library_dbu.mk  |2 
 dbaccess/Module_dbaccess.mk  |1 
 dbaccess/UI_dbaccess.mk  |   16 
 dbaccess/inc/dbaccess_slotid.hrc |2 
 dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx |   37 +
 dbaccess/source/ui/inc/LimitBox.hxx  |   46 +
 dbaccess/source/ui/inc/QueryPropertiesDialog.hxx |   62 ++
 dbaccess/source/ui/inc/querycontroller.hxx   |3 
 dbaccess/source/ui/querydesign/LimitBox.cxx  |  150 ++
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx|  121 
 dbaccess/source/ui/querydesign/limitboxcontroller.hxx|   30 -
 dbaccess/source/ui/querydesign/querycontroller.cxx   |   23 
 dbaccess/uiconfig/dbquery/menubar/menubar.xml|2 
 dbaccess/uiconfig/ui/querypropertiesdialog.ui|  247 
++
 extras/source/glade/libreoffice-catalog.xml  |3 
 officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu |5 
 16 files changed, 616 insertions(+), 134 deletions(-)

New commits:
commit 7488ad52d7aa0941ec09757240acc3f542b3832a
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu Feb 28 20:07:03 2013 +0100

Add new dialog to Query Design View

In Query Properties Dialog can be set properties like
distinct values and limit.
To open choose Edit\Query Properties.

Steps of implementation:
- Add new slot to Edit menu (menubar.xml): delete the slot of distinct 
values,
  because it can set in this dialog too
- Separate LimitBox class from limitboxcontroller.cxx (LimitBox.hxx\cxx)
  With it only LimitBox header is included in the dialog source.
- Extend LimitBox class to work with new layout widget (make... and 
GetOptimalSize())
  and add it to the galde catalog
- Make a class for the new dialog (QueryPropertiesDialog.hxx\cxx) and
  write the .ui file. (querypropertiesdialog.ui)
- Syncronize the two LimitBox (querycontroller.cxx)

Change-Id: Ib84bef5a2ed55030333d6151342b99ff27766538

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index ef84bfe..fbb385d 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -166,6 +166,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/ui/dlg/paramdialog \
 dbaccess/source/ui/dlg/queryfilter \
 dbaccess/source/ui/dlg/queryorder \
+dbaccess/source/ui/dlg/QueryPropertiesDialog \
 dbaccess/source/ui/dlg/RelationDlg \
 dbaccess/source/ui/dlg/sqlmessage \
 dbaccess/source/ui/dlg/tablespage \
@@ -214,6 +215,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/ui/querydesign/JoinDesignView \
 dbaccess/source/ui/querydesign/JoinExchange \
 dbaccess/source/ui/querydesign/JoinTableView \
+dbaccess/source/ui/querydesign/LimitBox \
 dbaccess/source/ui/querydesign/limitboxcontroller \
 dbaccess/source/ui/querydesign/QTableConnection \
 dbaccess/source/ui/querydesign/QTableConnectionData \
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 3195bbf..0e5fe13 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
 Library_sdbt \
 Package_inc \
 Package_uiconfig \
+UI_dbaccess \
 ))
 
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git a/dbaccess/UI_dbaccess.mk b/dbaccess/UI_dbaccess.mk
new file mode 100644
index 000..71c6ddc
--- /dev/null
+++ b/dbaccess/UI_dbaccess.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UI_UI,dbaccess))
+
+$(eval $(call gb_UI_add_uifiles,dbaccess, \
+dbaccess/uiconfig/ui/querypropertiesdialog  \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc
index 37a333e..7d0af41 100644
--- a/dbaccess/inc/dbaccess_slotid.hrc
+++ b/dbaccess/inc/dbaccess_slotid.hrc
@@ -102,6 +102,8 @@
 #define SID_TABLEDESIGN_TABED_PRIMARYKEY ( SID_DBACCESS_START + 67 )
 #define SID_TABLEDESIGN_INSERTROWS  ( SID_DBACCESS_START +  68 )
 
+#define SID_QUERY_PROP_DLG  ( SID_DBACCESS_START +  69 )
+
 
 #endif // _DBACCESS_SLOTID_HRC_
 
diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx 
b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
new file mode 100644
index 000..fd37bcd
--- /dev/null
+++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
@@ -0,0 +1,37 @@
+/* 

[Libreoffice-commits] core.git: helpcontent2

[Zolnai Tamás]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 483dbb8a7eb3626d6b1ed552d486d58e0fe149dd
Author: Zolnai Tamás r...@linux-dre0.site
Date:   Sun Mar 3 00:47:05 2013 +0100

Updated core
Project: help  80057f99f605bb833eaa93a6cfc21b593a302783

diff --git a/helpcontent2 b/helpcontent2
index 0401988..80057f9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0401988227a539ef9181bfb26217b09fc360124e
+Subproject commit 80057f99f605bb833eaa93a6cfc21b593a302783
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - AllLangHelp_shared.mk source/text

[Zolnai Tamás]

 AllLangHelp_shared.mk |2 +
 source/text/shared/02/limit.xhp   |   26 ++
 source/text/shared/02/querypropdlg.xhp|   39 ++
 source/text/shared/explorer/database/02010100.xhp |3 +
 4 files changed, 70 insertions(+)

New commits:
commit 80057f99f605bb833eaa93a6cfc21b593a302783
Author: Zolnai Tamás r...@linux-dre0.site
Date:   Sun Mar 3 00:47:05 2013 +0100

Add help for Limit

Change-Id: I15ae938b8e07298191246231b00efae0c1315a74

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 86043e5..d30624b 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -493,6 +493,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/02/colortoolbar \
 helpcontent2/source/text/shared/02/flowcharts \
 helpcontent2/source/text/shared/02/fontwork \
+helpcontent2/source/text/shared/02/limit \
 helpcontent2/source/text/shared/02/more_controls \
 helpcontent2/source/text/shared/02/paintbrush \
 helpcontent2/source/text/shared/02/querypropdlg \
diff --git a/source/text/shared/02/limit.xhp b/source/text/shared/02/limit.xhp
new file mode 100644
index 000..297c0eb
--- /dev/null
+++ b/source/text/shared/02/limit.xhp
@@ -0,0 +1,26 @@
+?xml version=1.0 encoding=UTF-8?
+helpdocument version=1.0
+
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+--
+
+meta
+topic id=textshared02limitxml indexer=include
+title id=tit xml-lang=en-USLimit/title
+filename/text/shared/02/limit.xhp/filename
+/topic
+/meta
+body
+bookmark xml-lang=en-US branch=index 
id=bm_id3149991bookmark_valueSQL; LIMIT clause/bookmark_value
+/bookmark
+paragraph role=heading id=hd_id3149991 xml-lang=en-US 
level=1Limit/paragraph
+bookmark xml-lang=en-US branch=hid/.uno:DBLimit id=bm_id3147588 
localize=false/
+paragraph role=paragraph id=par_id3154894 xml-lang=en-USahelp 
hid=.Expands the created select statement of the link 
href=text/shared/explorer/database/02010100.xhp name=SQL QuerySQL 
Query/link by the LIMIT X clause/ahelp. This can be used to limit your SQL 
Query results to those that fall within the the first X number of 
it./paragraph
+/body
+/helpdocument
diff --git a/source/text/shared/explorer/database/02010100.xhp 
b/source/text/shared/explorer/database/02010100.xhp
index fb3990f..2a832d1 100644
--- a/source/text/shared/explorer/database/02010100.xhp
+++ b/source/text/shared/explorer/database/02010100.xhp
@@ -313,6 +313,9 @@
 paragraph role=paragraph id=par_id3150436 xml-lang=en-US l10n=U 
oldref=159For example, if the name Smith occurs several times in your 
address database, you can choose theemph Distinct Values/emph command to 
specify in the query that the name Smith will occur only once./paragraph
 paragraph role=paragraph id=par_id3152352 xml-lang=en-US l10n=U 
oldref=160For a query involving several fields, the combination of values 
from all fields must be unique so that the result can be formed from a specific 
record. For example, you have Smith in Chicago once in your address book and 
Smith in London twice. With theemph Distinct Values/emph command, the 
query will use the two fields last name and city and return the query 
result Smith in Chicago once and Smith in London once./paragraph
 paragraph role=paragraph id=par_id3149825 xml-lang=en-US l10n=U 
oldref=161In SQL, this command corresponds to the DISTINCT 
predicate./paragraph
+paragraph role=heading id=hd_id3153290 xml-lang=en-US 
level=3Limit/paragraph
+paragraph role=paragraph id=par_id3147501 xml-lang=en-USahelp 
hid=HID_QRYDGN_ROW_FUNCTIONAllows you to maximize the number of records with 
which query returns./ahelp/paragraph
+paragraph role=paragraph id=par_id3152350 xml-lang=en-USIf there is 
added a emphLimit/emph, you will get at most as many rows as the number you 
specify. Otherwise, you will see all records corresponding to the query 
criteria./paragraph
 paragraph role=heading id=hd_id3148926 xml-lang=en-US level=3 
l10n=U oldref=37Formulating filter conditions/paragraph
 section id=abfragekriterien
 paragraph role=paragraph id=par_id3153162 xml-lang=en-US l10n=U 
oldref=38When formulating filter conditions, various operators and commands 
are available to you. Apart from the relational operators, there are 
SQL-specific commands that query the content of database fields. If you use 
these commands in the $[officename] syntax, $[officename] automatically 
converts these into the corresponding SQL syntax. You can also enter the SQL 
command directly. The following tables give an overview of the operators and 
commands:/paragraph
commit 8274992b1f66d9fb5766afd9fc427038f64de5e0
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Fri Mar 1 

[Libreoffice-commits] core.git: dbaccess/inc dbaccess/Library_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/util officecfg/registry

[Zolnai Tamás]

 dbaccess/Library_dbu.mk  |1 
 dbaccess/inc/dbaccess_slotid.hrc |1 
 dbaccess/source/ui/inc/dbu_qry.hrc   |2 
 dbaccess/source/ui/inc/querycontroller.hxx   |4 
 dbaccess/source/ui/misc/uiservices.cxx   |2 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx   |   24 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx|  298 
++
 dbaccess/source/ui/querydesign/limitboxcontroller.hxx|   93 +++
 dbaccess/source/ui/querydesign/query.src |5 
 dbaccess/source/ui/querydesign/querycontroller.cxx   |   40 +
 dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml|3 
 dbaccess/util/dbu.component  |3 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu  |   11 
 officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu |5 
 14 files changed, 488 insertions(+), 4 deletions(-)

New commits:
commit 9a471b8cd85d1c08d53ed2675e580ca9466ca433
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Mon Feb 4 15:21:33 2013 +0100

Database: Add Limit in Query Desing View

Levels of implementation
 - Add a new toolbar item to ui (designobjectbar.xml)
 - Make a control for this element( LimitBox: derived from NumericBox)
 - Make an own controller for this control (LimitBoxController) and
   register it
 - Add new feature to the general\central controller (OQueryController)
   and construct a communication channel between the two controller
 - Modify the view switching (SQL-Design) methods to use\set limit
   value (QueryDesignView.cxx)

Conflicts:
dbaccess/source/ui/querydesign/QueryDesignView.cxx

Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690
Reviewed-on: https://gerrit.libreoffice.org/1994
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 1ca0f82..ef84bfe 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -214,6 +214,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
 dbaccess/source/ui/querydesign/JoinDesignView \
 dbaccess/source/ui/querydesign/JoinExchange \
 dbaccess/source/ui/querydesign/JoinTableView \
+dbaccess/source/ui/querydesign/limitboxcontroller \
 dbaccess/source/ui/querydesign/QTableConnection \
 dbaccess/source/ui/querydesign/QTableConnectionData \
 dbaccess/source/ui/querydesign/QTableWindow \
diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc
index c3db103..37a333e 100644
--- a/dbaccess/inc/dbaccess_slotid.hrc
+++ b/dbaccess/inc/dbaccess_slotid.hrc
@@ -83,6 +83,7 @@
 #define SID_APP_NEW_FOLDER  ( SID_DBACCESS_START +  53 )
 #define SID_APP_NEW_FORM( SID_DBACCESS_START +  54 )
 #define SID_DB_APP_PASTE_SPECIAL( SID_DBACCESS_START +  55 )
+#define SID_QUERY_LIMIT ( SID_DBACCESS_START +  56 )
 
 // status information
 #define SID_DB_APP_STATUS_TYPE  ( SID_DBACCESS_START +  57 )
diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc 
b/dbaccess/source/ui/inc/dbu_qry.hrc
index 659254f..1907b0c 100644
--- a/dbaccess/source/ui/inc/dbu_qry.hrc
+++ b/dbaccess/source/ui/inc/dbu_qry.hrc
@@ -42,7 +42,7 @@
 #define STR_QUERY_NOTABLE   RID_STR_QRY_START + 21
 #define STR_QRY_ORDERBY_UNRELATED   RID_STR_QRY_START + 22
 #define STR_QUERY_HANDLETEXTRID_STR_QRY_START + 23
-// free
+#define STR_QUERY_LIMIT_ALL RID_STR_QRY_START + 24
 // free
 #define STR_QRY_TOO_MANY_COLUMNSRID_STR_QRY_START + 26
 #define STR_SVT_SQL_SYNTAX_ERRORRID_STR_QRY_START + 27
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx 
b/dbaccess/source/ui/inc/querycontroller.hxx
index 789f9ea..0b28bae 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -78,6 +78,8 @@ namespace dbaui
 mutable ::rtl::OUString
 m_sName;// name of the query
 
+sal_Int64   m_nLimit;   // the limit of the query result 
(All==-1)
+
 sal_Int32   m_nVisibleRows; // which rows the selection browse 
should show
 sal_Int32   m_nSplitPos;// the position of the splitter
 sal_Int32   m_nCommandType; // the type of the object we're 
designing
@@ -143,12 +145,14 @@ namespace dbaui
 sal_BoolisEsacpeProcessing()const { return 
m_bEscapeProcessing; }
 sal_BoolisGraphicalDesign() const { return 
m_bGraphicalDesign; }
 sal_BoolisDistinct()const { return m_bDistinct; }
+sal_Int64   getLimit()  const { return 

Re: i18ned entry of numbers within LibreOffice

[Zolnai Tamás]

  The right place to extend functionality for native numbers is there.

 We were more looking in the direction of not doing worse than
 LibreOffice in general, rather than improving i18n of LibreOffice :)

 Since you are implying that LibreOffice as a whole requires ASCII
 digits everywhere, my thinking is that we'll drop this whole
 discussion and require ASCII digits.


 Right, than I bring back the first version and look after the
mentioned NumericBox
and the possibilities to use 'All' value with it. Native numbers remain for
the future. :)

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

Native Numbers in ComboBox

[Zolnai Tamás]

Hi all,

   I've got some question about usage of native numbers (i.e Hindi,
Japanise, Chinese numbers) related with a new feature. This new feature is
a new toolbar element, a ComboBox, which contains numbers. I tried to make
this item to use natvie numbers not just ascii digits. So this solution
allow users to type in such numbers if the locale is special, but in this
case ascii digits are not allowable. So the question is that using native
numbers in such UI element is worthy and with locking out ascii numbers
this feature will be useable or not?
   This feature has already been sent to review, but taking notice of the
long reviewing time, I thought the times comes to turn to such person who
is experienced in such problems and can answer these questions or add some
advices.
The patch: https://gerrit.libreoffice.org/#/c/1994/
The code using native numbers: limitboxcontroller.hxx\cxx - LimitBox class


Best Regards,
Zolnai Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Limit - New Database feature

[Zolnai Tamás]

Hi all,

  I'm working on a new Database feature per procuration of FSF.hu. This
feature is an editable
field on the Query Design Toolbar, with which the result of the query can
be limited. The reason
this feature is so usefull is that in Hungary it is part of the high school
graduation to use limit
and it should be work in design view.
  So my question is what the process of adding a new feature to LO. What
group decide wheather
a feature is usefull and can be added. I think I can cope with
implementation, but if someone has
some experience with toolbars or sql parser and Database, feel free to
share ideas.


Best Regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re:[PATCH] Change in core[feature/killsdf]: More cleanup aka clean up cleanup

[Zolnai Tamás]

Hi,  Stephan and Miklós

I submit a patch, which uses types more thoughtfully.
I hope that it meets all the requirements.

Regards,
Zolnai Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice