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

[Caolán McNamara]

 chart2/source/controller/inc/res_ErrorBar.hxx |    2 +-
 vcl/unx/gtk/a11y/atkwrapper.cxx               |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit f985e3add3870c1dee7fe88d37388281a333403a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 4 15:51:34 2014 +0000

    fix ambiguities
    
    Change-Id: I27c8ef11a0eedbcaf29865dff83841675b775171

diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 17b7e3b..91027f3 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -52,7 +52,7 @@ public:
     };
 
     ErrorBarResources(
-        VclBuilderContainer* pParent, Dialog* pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y );
+        VclBuilderContainer* pParent, Dialog* pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, ::chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y );
     virtual ~ErrorBarResources();
 
     void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
commit 1f7a5e58de2da3f88a1dc50d1574119b33b5eea3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 4 15:51:14 2014 +0000

    have a stab at fixing RHEL-5 build that hasn't got new atk roles
    
    Change-Id: Idbfc9bae9593416564783974ef7237e20e6400b0

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 5b5a446..8b7ea4a 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -270,10 +270,13 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
         ATK_ROLE_UNKNOWN,       // TREE_ITEM - registered below
         ATK_ROLE_TREE_TABLE,
         ATK_ROLE_SCROLL_PANE,   // COMMENT - mapped to atk_role_scroll_pane
-        ATK_ROLE_UNKNOWN,       // COMMENT_END - mapped to atk_role_unknown
-        ATK_ROLE_DOCUMENT_PRESENTATION,
-        ATK_ROLE_DOCUMENT_SPREADSHEET,
-        ATK_ROLE_DOCUMENT_TEXT
+        ATK_ROLE_UNKNOWN        // COMMENT_END - mapped to atk_role_unknown
+#if defined(ATK_CHECK_VERSION)
+        //older ver that doesn't define ATK_CHECK_VERSION doesn't have the following
+        , ATK_ROLE_DOCUMENT_PRESENTATION
+        , ATK_ROLE_DOCUMENT_SPREADSHEET
+        , ATK_ROLE_DOCUMENT_TEXT
+#endif
     };
 
     static bool initialized = false;