accessibility/source/standard/vclxaccessiblebox.cxx | 61 +++++---------------
sw/inc/helpid.h | 2
2 files changed, 18 insertions(+), 45 deletions(-)
New commits:
commit 775a86af2989ae0ed6873917ae2c2b727e161ff9
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 12:14:10 2014 +0100
drop unused helpids
Change-Id: I6bab5d141e0891611ab0a9e1f4f1029bc53b845a
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5465bb2..2f8dc9e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -365,8 +365,6 @@
#define HID_MODULE_TOOLBOX
"SW_HID_MODULE_TOOLBOX"
#define HID_MM_SELECTDBTABLEDDIALOG
"SW_HID_MM_SELECTDBTABLEDDIALOG"
-#define HID_MM_DBTABLEPREVIEWDIALOG
"SW_HID_MM_DBTABLEPREVIEWDIALOG"
-#define HID_MM_MAILBODY
"SW_HID_MM_MAILBODY"
#define HID_MM_SENDMAILS
"SW_HID_MM_SENDMAILS"
#define HID_MM_SENDMAILS_STATUSLB
"SW_HID_MM_SENDMAILS_STATUSLB"
#define HID_MAILMERGECHILD
"SW_HID_MAILMERGECHILD"
commit cfdc2cf64ae2a09f9d15bbe6ebdad30efece1489
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 12:13:20 2014 +0100
fix some more indent and strip ::rtl::
Change-Id: I8a4f220e6e07babbb2fa8f8dcab524ba90e62986
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 20aa8f3..fdf2e58 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -175,13 +175,13 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
}
case VCLEVENT_COMBOBOX_SELECT:
{
- VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
- if (pList != NULL && m_xText.is())
- {
+ VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
+ if (pList != NULL && m_xText.is())
+ {
Reference<XAccessibleText> xText
(m_xText->getAccessibleContext(), UNO_QUERY);
if ( xText.is() )
{
- ::rtl::OUString sText = xText->getSelectedText();
+ OUString sText = xText->getSelectedText();
if ( sText.isEmpty() )
sText = xText->getText();
pList->UpdateSelection_Acc(sText, m_bIsDropDownBox);
@@ -478,7 +478,7 @@ Any VCLXAccessibleBox::getCurrentValue( )
Reference<XAccessibleText> xText (m_xText->getAccessibleContext(),
UNO_QUERY);
if ( xText.is() )
{
- ::rtl::OUString sText = xText->getText();
+ OUString sText = xText->getText();
aAny <<= sText;
}
}
@@ -508,7 +508,7 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any&
aNumber )
SolarMutexGuard aSolarGuard;
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- ::rtl::OUString fValue;
+ OUString fValue;
bool bValid = (aNumber >>= fValue);
if( bValid )
{
@@ -538,7 +538,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet(
utl::AccessibleStateSetHelper& r
VCLXAccessibleComponent::FillAccessibleStateSet(rStateSet);
if (m_aBoxType == COMBOBOX )
{
- ::rtl::OUString sText;
+ OUString sText;
sal_Int32 nEntryCount = 0;
ComboBox* pComboBox = static_cast<ComboBox*>(GetWindow());
if (pComboBox != NULL)
commit 192e087f97166d2b3ff6151de04d16abbe45a1d4
Author: Jürgen Schmidt <j...@apache.org>
Date: Wed Jul 2 08:19:37 2014 +0000
Related: #i124856# guard against crash
Patch By: hanya
Review By: jsc
(cherry picked from commit efe87c0d84e5f76034378d48d0d1fc2025a37645)
Conflicts:
accessibility/source/standard/vclxaccessiblebox.cxx
Change-Id: I24fd4278406dacea33230cc1bf1528e3c5aaedf2
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index f9a63d6..20aa8f3 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -176,7 +176,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
case VCLEVENT_COMBOBOX_SELECT:
{
VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
- if (pList != NULL)
+ if (pList != NULL && m_xText.is())
{
Reference<XAccessibleText> xText
(m_xText->getAccessibleContext(), UNO_QUERY);
if ( xText.is() )
commit 0f1d72510a81094c245bfdb70f18ec15a7b557ce
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 12:03:36 2014 +0100
fix some mangled indentation
Change-Id: I09be3a66562e1c5c1c2b27c670672f63b0a652b0
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 117fc73..f9a63d6 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -116,8 +116,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
{
// Forward the call to the list child.
- VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
- if ( pList == NULL )
+ VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
+ if ( pList == NULL )
{
getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -139,8 +139,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
}
case VCLEVENT_DROPDOWN_OPEN:
{
- VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
- if ( pList == NULL )
+ VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
+ if ( pList == NULL )
{
getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -154,8 +154,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
}
case VCLEVENT_DROPDOWN_CLOSE:
{
- VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
- if ( pList == NULL )
+ VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
+ if ( pList == NULL )
{
getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -175,17 +175,16 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
}
case VCLEVENT_COMBOBOX_SELECT:
{
- VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
- if (pList != NULL)
- {
- Reference<XAccessibleText> xText
(m_xText->getAccessibleContext(), UNO_QUERY);
- if ( xText.is() )
+ VCLXAccessibleList* pList =
static_cast<VCLXAccessibleList*>(m_xList.get());
+ if (pList != NULL)
+ {
+ Reference<XAccessibleText> xText
(m_xText->getAccessibleContext(), UNO_QUERY);
+ if ( xText.is() )
{
::rtl::OUString sText = xText->getSelectedText();
if ( sText.isEmpty() )
sText = xText->getText();
- pList->UpdateSelection_Acc (sText,
m_bIsDropDownBox);
- //if(m_bIsDropDownBox && !pList->IsInDropDown())
+ pList->UpdateSelection_Acc(sText, m_bIsDropDownBox);
if (m_bIsDropDownBox || ( !m_bIsDropDownBox &&
m_aBoxType==COMBOBOX))
NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
@@ -195,7 +194,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue);
}
- }
+ }
break;
}
//case VCLEVENT_DROPDOWN_OPEN:
@@ -260,30 +259,6 @@ void VCLXAccessibleBox::ProcessWindowEvent (const
VclWindowEvent& rVclWindowEven
}
}
break;
- /*
- // MT: Not sending VCLEVENT_LISTBOX_STATEUPDATE, see comment in
ListBox::SelectEntryPos
- case VCLEVENT_LISTBOX_STATEUPDATE:
- {
- // Need to update the INDETERMINATE state sometimes
- if (m_bIsDropDownBox && m_aBoxType==LISTBOX)
- {
- sal_Int32 nSelectedEntryCount = 0;
- ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
- if (pListBox != NULL && pListBox->GetEntryCount() > 0)
- {
- nSelectedEntryCount = pListBox->GetSelectEntryCount();
- Any aOldValue;
- Any aNewValue;
- if ( nSelectedEntryCount == 0)
- aNewValue <<= AccessibleStateType::INDETERMINATE;
- else
- aOldValue <<= AccessibleStateType::INDETERMINATE;
- NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED,
aOldValue, aNewValue);
- }
- }
- break;
- }
- */
default:
VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
}
@@ -403,7 +378,7 @@ sal_Int32 SAL_CALL
VCLXAccessibleBox::getAccessibleIndexInParent (void)
//===== XAccessibleAction ===================================================
-sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void)
+sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount()
throw (RuntimeException, std::exception)
{
::osl::Guard< ::osl::Mutex> aGuard (GetMutex());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
