[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig i18npool/source

[Caolán McNamara]

 cui/source/inc/tabstpge.hxx               |    4 ++++
 cui/source/tabpages/tabstpge.cxx          |   13 +++++++------
 cui/uiconfig/ui/paratabspage.ui           |    6 ++++++
 i18npool/source/localedata/data/pt_AO.xml |    2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 72ca010b217a6df3a0edd47f3bedd60882e5681c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 3 13:11:42 2013 +0100

    sync the FixedFormatskey1 entry of pt-AO with other pt entries
    
    because Estandar is Spanish so that's not right anyway and
    commit 06b6e220b5e9250c688daaea4a7eb2ae64f1863c fixed the same
    problem for pt-PT
    
    Change-Id: Ia3955cbf2af89e03a574a25a5d968a7d2d2d818a

diff --git a/i18npool/source/localedata/data/pt_AO.xml b/i18npool/source/localedata/data/pt_AO.xml
index fc83a11..37f1eb5 100644
--- a/i18npool/source/localedata/data/pt_AO.xml
+++ b/i18npool/source/localedata/data/pt_AO.xml
@@ -145,7 +145,7 @@
       <FormatCode>DD-MM-AAAA HH:MM:SS</FormatCode>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
-      <FormatCode>Estandar</FormatCode>
+      <FormatCode>Geral</FormatCode>
     </FormatElement>
     <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
       <FormatCode>0</FormatCode>
commit a4e9c5f3420eba9d1de8817aa553d50bbf2bc81d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 3 13:09:15 2013 +0100

    restore a11y relations and some other clean up
    
    Change-Id: Ic44d45a969bc7e4c809906a59650eab1ee37c424

diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 8ffa903..c19f085 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -23,6 +23,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 #include <sfx2/tabdlg.hxx>
 
 #include <editeng/tstpitem.hxx>
@@ -94,6 +95,9 @@ private:
     PushButton*     m_pDelAllBtn;
     PushButton*     m_pDelBtn;
 
+    VclContainer*   m_pTypeFrame;
+    VclContainer*   m_pFillFrame;
+
     // local variables, internal functions
     SvxTabStop      aAktTab;
     SvxTabStopItem  aNewTabs;
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index b620af1..ba44cf2 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -141,6 +141,9 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
     get(m_pDelAllBtn,"buttonBTN_DELALL");
     get(m_pDelBtn,"buttonBTN_DEL");
 
+    get(m_pTypeFrame, "frameFL_TABTYPE");
+    get(m_pFillFrame, "frameFL_FILLCHAR");
+
     // This page needs ExchangeSupport
     SetExchangeSupport();
 
@@ -160,7 +163,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
     m_pCenterTab->SetClickHdl( aLink );
 
     m_pDezChar->SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, GetDezCharHdl_Impl ) );
-    //m_pDezChar->SetMaxTextLen(1);
     m_pDezChar->Disable();
     m_pDezCharLabel->Disable();
 
@@ -171,7 +173,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
     m_pFillSolidLine->SetClickHdl( aLink );
     m_pFillSpecial->SetClickHdl( aLink );
     m_pFillChar->SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, GetFillCharHdl_Impl ) );
-    //m_pFillChar->SetMaxTextLen(1);
     m_pFillChar->Disable();
 
     m_pTabBox->SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, SelectHdl_Impl ) );
@@ -336,8 +337,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
         m_pDezCharLabel->Disable();
         m_pDezChar->Disable();
     }
-//     if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL )
-//         m_pTabTypeLabel->Disable();
+     if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL )
+         m_pTypeFrame->Disable();
     if ( ( TABFILL_NONE & nFlag ) == TABFILL_NONE )
         m_pNoFillChar->Disable();
     if ( ( TABFILL_POINT & nFlag ) == TABFILL_POINT )
@@ -351,8 +352,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
         m_pFillSpecial->Disable();
         m_pFillChar->Disable();
     }
-//     if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL )
-//         m_pFillLabel->Disable();
+     if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL )
+         m_pFillFrame->Disable();
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index 709e9df..fe2e2f8 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -416,6 +416,9 @@
                         <property name="xalign">0.090000003576278687</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">radiobuttonBTN_FILLCHAR_NO</property>
+                        <accessibility>
+                          <relation type="label-for" target="entryED_FILLCHAR_OTHER"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -430,6 +433,9 @@
                         <property name="can_focus">False</property>
                         <property name="invisible_char">•</property>
                         <property name="width_chars">1</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="radiobuttonBTN_FILLCHAR_OTHER"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>