[Libreoffice-commits] core.git: 2 commits - dbaccess/uiconfig l10ntools/inc l10ntools/source officecfg/registry

[Zolnai Tamás]

 dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml            |    1 +
 l10ntools/inc/cfgmerge.hxx                                       |    3 ---
 l10ntools/inc/xrmmerge.hxx                                       |    2 +-
 l10ntools/source/cfgmerge.cxx                                    |   10 ----------
 officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu |    3 +++
 5 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit f167f037351d953e324eb97d6055064efa2d7f59
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Tue Apr 23 23:20:53 2013 +0200

    L10ntools: remove some lang vectors from parsing
    
    Change-Id: I3b9ef50d8e0c1e99d5b535d95a5add90a1cbaf03

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 00838de..9710008 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -122,7 +122,6 @@ protected:
 
 private:
     int ExecuteAnalyzedToken( int nToken, char *pToken );
-    std::vector<OString> aLanguages;
     void AddText(
         OString &rText,
         const OString &rIsoLang,
@@ -145,8 +144,6 @@ class CfgExport : public CfgParser
 {
 private:
     OString sPath;
-    std::vector<OString> aLanguages;
-
     PoOfstream pOutputStream;
 
 protected:
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 9e5fbae..a2a8906 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -38,7 +38,6 @@ private:
     OString sCurrentCloseTag;
     OString sCurrentText;
 protected:
-    std::vector<OString> aLanguages;
     OString GetAttribute( const OString &rToken, const OString &rAttribute );
     void Error( const OString &rError );
 
@@ -113,6 +112,7 @@ private:
     OString sFilename;
     ResData *pResData;
     std::ofstream pOutputStream;
+    std::vector<OString> aLanguages;
 
 protected:
     void WorkOnDesc(
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index e5923ab..b2f47b2 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -221,11 +221,6 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
                     case CFG_TEXT_START: {
                         if ( sCurrentResTyp != sTokenName ) {
                             WorkOnResourceEnd();
-                            OString sCur;
-                            for( unsigned int i = 0; i < aLanguages.size(); ++i ){
-                                sCur = aLanguages[ i ];
-                                pStackData->sText[ sCur ] = OString();
-                            }
                          }
                         sCurrentResTyp = sTokenName;
 
@@ -257,11 +252,6 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
             else if ( sTokenName == "label" ) {
                 if ( sCurrentResTyp != sTokenName ) {
                     WorkOnResourceEnd();
-                    OString sCur;
-                    for( unsigned int i = 0; i < aLanguages.size(); ++i ){
-                        sCur = aLanguages[ i ];
-                        pStackData->sText[ sCur ] = OString();
-                    }
                 }
                 sCurrentResTyp = sTokenName;
             }
commit 85486f711e03b8418a6b8fb2eeb2b74b2e90581a
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Apr 21 23:25:35 2013 +0200

    Access Query Properties Dialog from toolbar too
    
    Change-Id: Ide4697e6903c9550d31ea22ff0a5881878fddacf

diff --git a/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml b/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
index 9d807d0..cc571e1 100644
--- a/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
+++ b/dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml
@@ -25,4 +25,5 @@
  <toolbar:toolbaritem xlink:href=".uno:DBViewAliases" toolbar:text="" toolbar:style=""/>
  <toolbar:toolbaritem xlink:href=".uno:DBDistinctValues" toolbar:text="" toolbar:style=""/>
  <toolbar:toolbaritem xlink:href=".uno:DBLimit"/>
+ <toolbar:toolbaritem xlink:href=".uno:DBQueryPropertiesDialog"/>
 </toolbar:toolbar>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
index 9a5873f..c34672d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
@@ -81,6 +81,9 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Query Properties</value>
                 </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
             </node>
             <node oor:name=".uno:PasteSpecial" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">