openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1449807 - in /openoffice/branches/l10n/main: l10ntools/source/gConSrc.hxx l10ntools/source/gConSrcWrap.cxx l10ntools/source/gConSrclex.l l10ntools/source/gConXcs.hxx sc/source/ui/src/popup.src
Date Mon, 25 Feb 2013 18:52:02 GMT
Author: jani
Date: Mon Feb 25 18:52:01 2013
New Revision: 1449807

URL: http://svn.apache.org/r1449807
Log:
sc module is working, with all macros

Modified:
    openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx
    openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
    openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l
    openoffice/branches/l10n/main/l10ntools/source/gConXcs.hxx
    openoffice/branches/l10n/main/sc/source/ui/src/popup.src

Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx?rev=1449807&r1=1449806&r2=1449807&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx Mon Feb 25 18:52:01 2013
@@ -67,6 +67,7 @@ class convert_src : public convert_gen_i
     bool                     mbAutoPush;
     bool                     mbValuePresent;
     int                      miListCount;
+    int                      miMacroLevel;
     void execute();
 };
 #endif
\ No newline at end of file

Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx?rev=1449807&r1=1449806&r2=1449807&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx Mon Feb 25 18:52:01 2013
@@ -162,6 +162,7 @@ void convert_src::setMacro(char *syyText
   mbExpectName  =
   mbExpectMacro =
   mbAutoPush    = true;
+  miMacroLevel  = mcStack.size();
   mcStack.push_back("");
 }
 
@@ -224,7 +225,7 @@ void convert_src::setNL(char *syyText, b
 
   if (!bMacro && mbExpectMacro)
   {
-    if (mcStack.size())
+    while ((int)mcStack.size() > miMacroLevel)
       mcStack.pop_back();
     mbEnUs        =
     mbExpectMacro = false;

Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l?rev=1449807&r1=1449806&r2=1449807&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l Mon Feb 25 18:52:01 2013
@@ -167,52 +167,55 @@ KEYID [a-zA-Z0-9_-]+
 
 
 
-{PRE}[bB][iI][tT][mM][aA][pP]{SUF}                                          |
-{PRE}[bB][uU][tT][tT][oO][nN][iI][mM][aA][gG][eE]{SUF}                      |
-{PRE}[cC][aA][nN][cC][eE][lL][bB][uU][tT][tT][oO][nN]{SUF}                  |
-{PRE}[cC][hH][eE][cC][kK][bB][oO][xX]{SUF}                                  |
-{PRE}[cC][oO][nN][tT][rR][oO][lL]{SUF}                                      |
-{PRE}[cC][oO][mM][bB][oO][bB][oO][xX]{SUF}                                  |
-{PRE}[eE][dD][iI][tT]{SUF}                                                  |
-{PRE}[eE][rR][rR][oO][rR][bB][oO][xX]{SUF}                                  |
-{PRE}[fF][iI][xX][eE][dD][tT][eE][xX][tT]{SUF}                              |
-{PRE}[fF][iI][xX][eE][dD][lL][iI][nN][eE]{SUF}                              |
-{PRE}[fF][lL][oO][aA][tT][iI][nN][gG][wW][iI][nN][dD][oO][wW]{SUF}          |
-{PRE}[hH][eE][lL][pP][bB][uU][tT][tT][oO][nN]{SUF}                          |
-{PRE}[iI][dD][lL][iI][sS][tT]{SUF}                                          |
-{PRE}[iI][mM][aA][gG][eE]{SUF}                                              |
-{PRE}[iI][mM][aA][gG][eE][lL][iI][sS][tT]{SUF}                              |
-{PRE}[iI][mM][aA][gG][eE][bB][uU][tT][tT][oO][nN]{SUF}                      |
-{PRE}[iI][mM][aA][gG][eE][rR][aA][dD][iI][oO][bB][uU][tT][tT][oO][nN]{SUF}  |
-{PRE}[iI][nN][fF][oO][bB][oO][xX]{SUF}                                      |
-{PRE}[lL][iI][sS][tT][bB][oO][xX]{SUF}                                      |
-{PRE}[mM][eE][nN][uU]{SUF}                                                  |
-{PRE}[mM][eE][nN][uU][bB][uU][tT][tT][oO][nN]{SUF}                          |
-{PRE}[mM][eE][nN][uU][iI][tT][eE][mM]{SUF}                                  |
-{PRE}[mM][eE][tT][rR][iI][cC][fF][iI][eE][lL][dD]{SUF}                      |
-{PRE}[mM][oO][dD][aA][lL][dD][iI][aA][lL][oO][gG]{SUF}                      |
-{PRE}[mM][oO][dD][eE][lL][eE][sS][sS][dD][iI][aA][lL][oO][gG]{SUF}          |
-{PRE}[mM][uU][lL][tT][iI][lL][iI][nN][eE][eE][dD][iI][tT]{SUF}              |
-{PRE}[nN][uU][mM][eE][rR][iI][cC][fF][iI][eE][lL][dD]{SUF}                  |
-{PRE}[oO][kK][bB][uU][tT][tT][oO][nN]{SUF}                                  |
-{PRE}[pP][aA][gG][eE][iI][tT][eE][mM]{SUF}                                  |
-{PRE}[pP][aA][gG][eE][lL][iI][sS][tT]{SUF}                                  |
-{PRE}[pP][uU][sS][hH][bB][uU][tT][tT][oO][nN]{SUF}                          |
-{PRE}[qQ][uU][eE][rR][yY][bB][oO][xX]{SUF}                                  |
-{PRE}[rR][aA][dD][iI][oO][bB][uU][tT][tT][oO][nN]{SUF}                      |
-{PRE}[rR][eE][sS][oO][uU][rR][cC][eE]{SUF}                                  |
-{PRE}[sS][pP][iI][nN][fF][iI][eE][lL][dD]{SUF}                              |
-{PRE}[sS][tT][rR][iI][nN][gG]{SUF}                                          |
-{PRE}[sS][tT][rR][iI][nN][gG][aA][rR][rR][aA][yY]{SUF}                      |
-{PRE}[tT][aA][bB][cC][oO][nN][tT][rR][oO][lL]{SUF}                          |
-{PRE}[tT][aA][bB][dD][iI][aA][lL][oO][gG]{SUF}                              |
-{PRE}[tT][aA][bB][pP][aA][gG][eE]{SUF}                                      |
-{PRE}[tT][oO][oO][lL][bB][oO][xX]{SUF}                                      |
-{PRE}[tT][oO][oO][lL][bB][oO][xX][iI][tT][eE][mM]{SUF}                      |
-{PRE}[tT][rR][iI][sS][tT][aA][tT][eE][bB][oO][xX]{SUF}                      |
-{PRE}[wW][aA][rR][nN][iI][nN][gG][bB][oO][xX]{SUF}                          |
-{PRE}[wW][iI][nN][dD][oO][wW]{SUF}                                          |
-{PRE}[wW][oO][rR][kK][wW][iI][nN][dD][oO][wW]{SUF}                          {
+{PRE}[bB][iI][tT][mM][aA][pP]{SUF}                                                 |
+{PRE}[bB][uU][tT][tT][oO][nN][iI][mM][aA][gG][eE]{SUF}                             |
+{PRE}[cC][aA][nN][cC][eE][lL][bB][uU][tT][tT][oO][nN]{SUF}                         |
+{PRE}[cC][hH][eE][cC][kK][bB][oO][xX]{SUF}                                         |
+{PRE}[cC][oO][nN][tT][rR][oO][lL]{SUF}                                             |
+{PRE}[cC][oO][mM][bB][oO][bB][oO][xX]{SUF}                                         |
+{PRE}[dD][oO][cC][kK][iI][nN][gG][wW][iI][nN][dD][oO][wW]{SUF}                     |
+{PRE}[eE][dD][iI][tT]{SUF}                                                         |
+{PRE}[eE][rR][rR][oO][rR][bB][oO][xX]{SUF}                                         |
+{PRE}[fF][iI][xX][eE][dD][tT][eE][xX][tT]{SUF}                                     |
+{PRE}[fF][iI][xX][eE][dD][lL][iI][nN][eE]{SUF}                                     |
+{PRE}[fF][lL][oO][aA][tT][iI][nN][gG][wW][iI][nN][dD][oO][wW]{SUF}                 |
+{PRE}[hH][eE][lL][pP][bB][uU][tT][tT][oO][nN]{SUF}                                 |
+{PRE}[iI][dD][lL][iI][sS][tT]{SUF}                                                 |
+{PRE}[iI][mM][aA][gG][eE]{SUF}                                                     |
+{PRE}[iI][mM][aA][gG][eE][lL][iI][sS][tT]{SUF}                                     |
+{PRE}[iI][mM][aA][gG][eE][bB][uU][tT][tT][oO][nN]{SUF}                             |
+{PRE}[iI][mM][aA][gG][eE][rR][aA][dD][iI][oO][bB][uU][tT][tT][oO][nN]{SUF}         |
+{PRE}[iI][nN][fF][oO][bB][oO][xX]{SUF}                                             |
+{PRE}[lL][iI][sS][tT][bB][oO][xX]{SUF}                                             |
+{PRE}[mM][eE][nN][uU]{SUF}                                                         |
+{PRE}[mM][eE][nN][uU][bB][uU][tT][tT][oO][nN]{SUF}                                 |
+{PRE}[mM][eE][nN][uU][iI][tT][eE][mM]{SUF}                                         |
+{PRE}[mM][eE][tT][rR][iI][cC][fF][iI][eE][lL][dD]{SUF}                             |
+{PRE}[mM][oO][dD][aA][lL][dD][iI][aA][lL][oO][gG]{SUF}                             |
+{PRE}[mM][oO][dD][eE][lL][eE][sS][sS][dD][iI][aA][lL][oO][gG]{SUF}                 |
+{PRE}[mM][uU][lL][tT][iI][lL][iI][nN][eE][eE][dD][iI][tT]{SUF}                     |
+{PRE}[nN][uU][mM][eE][rR][iI][cC][fF][iI][eE][lL][dD]{SUF}                         |
+{PRE}[oO][kK][bB][uU][tT][tT][oO][nN]{SUF}                                         |
+{PRE}[pP][aA][gG][eE][iI][tT][eE][mM]{SUF}                                         |
+{PRE}[pP][aA][gG][eE][lL][iI][sS][tT]{SUF}                                         |
+{PRE}[pP][uU][sS][hH][bB][uU][tT][tT][oO][nN]{SUF}                                 |
+{PRE}[qQ][uU][eE][rR][yY][bB][oO][xX]{SUF}                                         |
+{PRE}[rR][aA][dD][iI][oO][bB][uU][tT][tT][oO][nN]{SUF}                             |
+{PRE}[rR][eE][sS][oO][uU][rR][cC][eE]{SUF}                                         |
+{PRE}[sS][fF][xX][sS][tT][yY][lL][eE][fF][aA][mM][iI][lL][iI][eS][sS]{SUF}         |
+{PRE}[sS][fF][xX][sS][tT][yY][lL][eE][fF][aA][mM][iI][lL][yY][iI][tT][eE][mM]{SUF} |
+{PRE}[sS][pP][iI][nN][fF][iI][eE][lL][dD]{SUF}                                     |
+{PRE}[sS][tT][rR][iI][nN][gG]{SUF}                                                 |
+{PRE}[sS][tT][rR][iI][nN][gG][aA][rR][rR][aA][yY]{SUF}                             |
+{PRE}[tT][aA][bB][cC][oO][nN][tT][rR][oO][lL]{SUF}                                 |
+{PRE}[tT][aA][bB][dD][iI][aA][lL][oO][gG]{SUF}                                     |
+{PRE}[tT][aA][bB][pP][aA][gG][eE]{SUF}                                             |
+{PRE}[tT][oO][oO][lL][bB][oO][xX]{SUF}                                             |
+{PRE}[tT][oO][oO][lL][bB][oO][xX][iI][tT][eE][mM]{SUF}                             |
+{PRE}[tT][rR][iI][sS][tT][aA][tT][eE][bB][oO][xX]{SUF}                             |
+{PRE}[wW][aA][rR][nN][iI][nN][gG][bB][oO][xX]{SUF}                                 |
+{PRE}[wW][iI][nN][dD][oO][wW]{SUF}                                                 |
+{PRE}[wW][oO][rR][kK][wW][iI][nN][dD][oO][wW]{SUF}                                 {
   yyless(strlen(yytext)-1);
   LOCptr->setCmd(yytext);
   BEGIN(CMD);
@@ -228,11 +231,11 @@ KEYID [a-zA-Z0-9_-]+
 }
 
 <CMD>"{" {
-  yyless(1);
+  LOCptr->startBlock(yytext);
   BEGIN(INITIAL);
 }
 
-<CMD>[\\\n/] {
+<CMD>[\\\r\n/] {
   yyless(1);
   BEGIN(INITIAL);
 }
@@ -268,7 +271,8 @@ KEYID [a-zA-Z0-9_-]+
 
 
 
-{PRE}[iI][tT][eE][mM][lL][iI][sS][tT]{SUFT} {
+{PRE}[iI][tT][eE][mM][lL][iI][sS][tT]{SUFT}                             |
+{PRE}[sS][tT][yY][lL][eE][fF][aA][mM][iI][lL][yY][lL][iI][sS][tT]{SUF}  {
   yyless(strlen(yytext)-1);
   LOCptr->setList(yytext);
 }

Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcs.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcs.hxx?rev=1449807&r1=1449806&r2=1449807&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcs.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcs.hxx Mon Feb 25 18:52:01 2013
@@ -39,15 +39,14 @@ class convert_xcs : public convert_gen_i
     convert_xcs(l10nMem& crMemory);
     ~convert_xcs();
 
-  void setKey(char *syyText);
-  void unsetKey(char *syyText);
-  void startCollectData(char *syyText);
+    void setKey(char *syyText);
+    void unsetKey(char *syyText);
+    void startCollectData(char *syyText);
     void stopCollectData(char *syyText);
 
   private:
-  std::string msKey;
-  bool        mbCollectingData;
-
+    std::string msKey;
+    bool        mbCollectingData;
 
     void execute();
 };

Modified: openoffice/branches/l10n/main/sc/source/ui/src/popup.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/src/popup.src?rev=1449807&r1=1449806&r2=1449807&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/src/popup.src (original)
+++ openoffice/branches/l10n/main/sc/source/ui/src/popup.src Mon Feb 25 18:52:01 2013
@@ -318,9 +318,9 @@ Menu RID_POPUP_EDIT
 		};
 		MenuItem
 		{
-			Text [ en-US ] = "Style" ;
 			Identifier = RID_MN_FORMAT_STYLE ;
 			HelpID = HID_MN_FORMAT_STYLE ;
+			Text [ en-US ] = "Style" ;
 			SubMenu = Menu
 			{
 				ItemList =



Mime
View raw message