You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC
svn commit: r1551937 [6/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/s...
Modified: openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx Wed Dec 18 13:27:09 2013
@@ -116,7 +116,6 @@ namespace accessibility
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- // IA2 CWS
sal_Int32 SAL_CALL getRoleType();
private:
Modified: openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx Wed Dec 18 13:27:09 2013
@@ -52,7 +52,6 @@
#include <comphelper/accessibletexthelper.hxx>
#include <rtl/ref.hxx>
-// IAccessible2 implementation, 2009
#ifndef _SVTOOLS_HRC
#include "svtools/svtools.hrc"
#endif
@@ -594,7 +593,6 @@ private:
virtual ::css::uno::Reference< ::css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint(::css::awt::Point const & rPoint)
throw (::css::uno::RuntimeException);
-// IAccessible2 implementation, 2009
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
// ??? Will be called with both the external (Solar) and internal mutex
@@ -648,7 +646,6 @@ private:
void handleSelectionChangeNotification();
void notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast );
-// IAccessible2 implementation, 2009
::sal_Int32 getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos);
void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId);
Modified: openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx Wed Dec 18 13:27:09 2013
@@ -189,7 +189,6 @@ protected:
virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent);
virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
-// IAccessible2 implementation, 2009
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
private:
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx Wed Dec 18 13:27:09 2013
@@ -130,7 +130,6 @@ namespace accessibility
SolarMethodGuard aGuard( *this );
// TODO: localize this!
-// IAccessible2 implementation, 2009
//String sName = mpBrowseBox->GetColumnDescription( getColumnPos( ) );
//if ( 0 == sName.Len() )
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessiblelistboxentry.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessiblelistboxentry.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessiblelistboxentry.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/extended/accessiblelistboxentry.cxx Wed Dec 18 13:27:09 2013
@@ -115,7 +115,6 @@ namespace accessibility
}
}
- // IA2 CWS
void AccessibleListBoxEntry::NotifyAccessibleEvent( sal_Int16 _nEventId,
const ::com::sun::star::uno::Any& _aOldValue,
const ::com::sun::star::uno::Any& _aNewValue )
@@ -214,10 +213,8 @@ namespace accessibility
{
::rtl::OUString sRet;
SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
- //IAccessibility2 Implementation 2009-----
if ( pEntry )
sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry );
- //-----IAccessibility2 Implementation 2009
return sRet;
}
// -----------------------------------------------------------------------------
@@ -390,10 +387,8 @@ namespace accessibility
SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
DBG_ASSERT( pParentEntry, "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!" );
- //IAccessibility2 Implementation 2009-----
if ( pParentEntry )
pParentEntry = getListBox()->GetParent(pParentEntry);
- //-----IAccessibility2 Implementation 2009
if ( pParentEntry )
xParent = new AccessibleListBoxEntry( *getListBox(), pParentEntry, NULL );
// note that we pass NULL here as parent-accessible:
@@ -885,9 +880,7 @@ namespace accessibility
}
}else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN)) || nIndex == 0 )
{
- //IAccessibility2 Implementation 2009-----
if( pEntry->HasChilds() || pEntry->HasChildsOnDemand() )
- //-----IAccessibility2 Implementation 2009
return getListBox()->IsExpanded( pEntry ) ? \
::rtl::OUString(TK_RES_STRING(STR_SVT_ACC_ACTION_COLLAPSE)) :
::rtl::OUString(TK_RES_STRING(STR_SVT_ACC_ACTION_EXPAND));
@@ -915,11 +908,7 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
EnsureIsAlive();
-// IAccessible2 implementation, 2009
-// SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
-// SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
-
- SvLBoxEntry* pEntry =GetRealChild(nChildIndex);
+ SvLBoxEntry* pEntry = GetRealChild(nChildIndex);
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -1190,7 +1179,7 @@ namespace accessibility
SvLBoxEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
{
- sal_Int32 nValue, nValueMin, nValueMax;
+ sal_Int32 nValue(0), nValueMin(0), nValueMax(0);
aNumber >>= nValue;
getMinimumValue() >>= nValueMin;
getMaximumValue() >>= nValueMax;
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/extended/textwindowaccessibility.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/extended/textwindowaccessibility.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/extended/textwindowaccessibility.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/extended/textwindowaccessibility.cxx Wed Dec 18 13:27:09 2013
@@ -1533,21 +1533,7 @@ Document::retrieveParagraphRelationSet(
void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
- switch ( rVclWindowEvent.GetId() )
- {
- case VCLEVENT_WINDOW_GETFOCUS:
- case VCLEVENT_WINDOW_LOSEFOCUS:
- {
- // #107179# if our parent is a compound control (e.g. MultiLineEdit),
- // suppress the window focus events here
-// IAccessible2 implementation 2009
- //if ( !m_bCompoundControlChild )
- VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
- }
- break;
- default:
- VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
- }
+ VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
}
// virtual
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/helper/accessiblestrings.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/helper/accessiblestrings.src?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/helper/accessiblestrings.src (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/helper/accessiblestrings.src Wed Dec 18 13:27:09 2013
@@ -25,12 +25,10 @@
#include <accessibility/helper/accessiblestrings.hrc>
#endif
-//IAccessibility2 Impplementaton 2009-----
String RID_STR_ACC_ACTION_CLICK
{
Text = "press";
};
-//-----IAccessibility2 Impplementaton 2009
String RID_STR_ACC_ACTION_TOGGLEPOPUP
{
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx Wed Dec 18 13:27:09 2013
@@ -238,9 +238,6 @@ sal_Bool VCLXAccessibleCheckBox::doAcces
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw IndexOutOfBoundsException();
- //IAccessibility2 Implementation 2009-----
- // return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
- //-----IAccessibility2 Implementation 2009
if(IsChecked())
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_UNCHECK ) );
else
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelist.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelist.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelist.cxx Wed Dec 18 13:27:09 2013
@@ -426,13 +426,7 @@ void VCLXAccessibleList::ProcessWindowEv
case VCLEVENT_COMBOBOX_SCROLLED:
UpdateEntryRange_Impl();
break;
- // IAccessible2 implementation, 2009
- /*
- case VCLEVENT_LISTBOX_SELECT:
- if ( !m_bDisableProcessEvent )
- UpdateSelection_Impl();
- break;
- */
+
// The selection events VCLEVENT_COMBOBOX_SELECT and
// VCLEVENT_COMBOBOX_DESELECT are not handled here because here we
// have no access to the edit field. Its text is necessary to
@@ -562,16 +556,7 @@ Reference<XAccessible> VCLXAccessibleLis
{
xChild = m_aAccessibleChildren[nPos];
// check if position is empty and can be used else we have to adjust all entries behind this
- if ( xChild.is() )
- {
- // IAccessible2 implementation, 2009
- /*
- ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos;
- ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent);
- adjustEntriesIndexInParent( aIter, aTemp);
- */
- }
- else
+ if ( !xChild.is() )
{
xChild = new VCLXAccessibleListItem(m_pListBoxHelper, i, this);
m_aAccessibleChildren[nPos] = xChild;
@@ -584,7 +569,6 @@ Reference<XAccessible> VCLXAccessibleLis
sal_Bool bNowSelected = sal_False;
if ( m_pListBoxHelper )
bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i);
- // IAccessible2 implementation 2009
if (bNowSelected)
m_nCurSelectedPos = sal_uInt16(i);
VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get());
@@ -605,27 +589,6 @@ Reference<XAccessible> VCLXAccessibleLis
void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex)
{
- // IAccessible2 implementation 2009
- /*
- if ( !bItemInserted )
- {
- if ( nIndex == -1 ) // special handling here
- {
- clearItems();
- }
- else
- {
- if ( nIndex >= 0 && static_cast<sal_uInt16>(nIndex) < m_aAccessibleChildren.size() )
- {
- ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex);
- ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent);
- adjustEntriesIndexInParent( aIter, aTemp );
- }
- }
- }
- else
- getAccessibleChild(nIndex);
- */
clearItems();
NotifyAccessibleEvent (
AccessibleEventId::INVALIDATE_ALL_CHILDREN,
@@ -1074,12 +1037,8 @@ awt::Rectangle VCLXAccessibleList::implG
if ( pBox )
{
Size aSize = pBox->GetSubEdit()->GetSizePixel();
- // IAccessible2 implementation, 2009
- //aBounds.X += aSize.Height();
- //aBounds.Y += aSize.Width();
aBounds.Y += aSize.Height();
aBounds.Height -= aSize.Height();
- //aBounds.Width -= aSize.Width();
}
}
}
@@ -1107,8 +1066,6 @@ awt::Point VCLXAccessibleList::getLocati
ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
if ( pBox )
{
- //aPos.X += pBox->GetSubEdit()->GetSizePixel().Height();
- //aPos.Y += pBox->GetSubEdit()->GetSizePixel().Width();
aPos.Y += pBox->GetSubEdit()->GetSizePixel().Height();
}
}
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelistitem.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelistitem.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblelistitem.cxx Wed Dec 18 13:27:09 2013
@@ -318,7 +318,6 @@ Reference< XAccessibleStateSet > SAL_CAL
{
pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
- // IAccessible2 implementation, 2009
if(m_pListBoxHelper->IsEnabled())
{
pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx Wed Dec 18 13:27:09 2013
@@ -465,9 +465,7 @@ sal_Bool VCLXAccessibleMenuItem::doAcces
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw IndexOutOfBoundsException();
- //IAccessibility2 Impplementaton 2009-----
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ) );
- //-----IAccessibility2 Impplementaton 2009
}
// -----------------------------------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx Wed Dec 18 13:27:09 2013
@@ -276,7 +276,6 @@ Any VCLXAccessibleScrollBar::getMinimumV
// -----------------------------------------------------------------------------
-// IAccessible2 implementation, 2009
::rtl::OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException)
{
OExternalLockGuard aGuard( this );
Modified: openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx (original)
+++ openoffice/branches/ooxml-osba/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx Wed Dec 18 13:27:09 2013
@@ -81,7 +81,6 @@ void VCLXAccessibleTabControl::UpdateFoc
void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected )
{
- // IAccessible2 implementation, 2009
//NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
Modified: openoffice/branches/ooxml-osba/main/basegfx/source/tools/debugplotter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/basegfx/source/tools/debugplotter.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/basegfx/source/tools/debugplotter.cxx (original)
+++ openoffice/branches/ooxml-osba/main/basegfx/source/tools/debugplotter.cxx Wed Dec 18 13:27:09 2013
@@ -45,7 +45,7 @@ namespace basegfx
"#" << ::std::endl <<
"# automatically generated by basegfx, don't change!" << ::std::endl <<
"#" << ::std::endl <<
- "# --- " << (const sal_Char*)rTitle << " ---" << ::std::endl <<
+ "# --- " << rTitle.getStr() << " ---" << ::std::endl <<
"#" << ::std::endl <<
"set parametric" << ::std::endl <<
"# set terminal postscript eps enhanced color " << ::std::endl <<
@@ -106,7 +106,7 @@ namespace basegfx
"pointmarkx(c,t) = c-0.03*t\n", // hack for displaying single points in parametric form
"pointmarky(c,t) = c+0.03*t\n", // hack for displaying single points in parametric form
"# end of setup\n",
- (const sal_Char*)rTitle );
+ rTitle.getStr() );
}
}
@@ -276,10 +276,10 @@ namespace basegfx
if( mpOutputStream )
*mpOutputStream << " '-' using ($1):($2) title \"Polygon "
- << (const sal_Char*)maPolygons.at(i).second << "\" with lp";
+ << maPolygons.at(i).second.getStr() << "\" with lp";
else
OSL_TRACE( " '-' using ($1):($2) title \"Polygon %s\" with lp",
- (const sal_Char*)maPolygons.at(i).second );
+ maPolygons.at(i).second.getStr() );
bNeedColon = true;
}
Modified: openoffice/branches/ooxml-osba/main/basic/source/runtime/methods.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/basic/source/runtime/methods.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/branches/ooxml-osba/main/basic/source/runtime/methods.cxx Wed Dec 18 13:27:09 2013
@@ -4311,7 +4311,7 @@ RTLFUNC(MsgBox)
pBox = new WarningBox( pParent, nWinBits, aMsg );
break;
case 64:
- pBox = new InfoBox( pParent, aMsg );
+ pBox = new InfoBox( pParent, nWinBits, aMsg );
break;
default:
pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );
Modified: openoffice/branches/ooxml-osba/main/binaryurp/source/cache.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/binaryurp/source/cache.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/binaryurp/source/cache.hxx (original)
+++ openoffice/branches/ooxml-osba/main/binaryurp/source/cache.hxx Wed Dec 18 13:27:09 2013
@@ -27,7 +27,12 @@
#include "sal/config.h"
#include <cstddef>
-#include <map>
+#include <list>
+#ifdef USE_UNORDERED_MAP
+ #include <unordered_map>
+#else
+ #include <map>
+#endif
#include "boost/noncopyable.hpp"
#include "osl/diagnose.h"
@@ -41,90 +46,66 @@ enum { size = 256, ignore = 0xFFFF };
}
-template< typename T > class Cache: private boost::noncopyable {
+template< typename T > class Cache : private boost::noncopyable {
public:
+ typedef sal_uInt16 IdxType;
+
explicit Cache(std::size_t size):
- size_(size), first_(map_.end()), last_(map_.end())
+ size_(size)
{
OSL_ASSERT(size < cache::ignore);
}
- sal_uInt16 add(T const & content, bool * found) {
- OSL_ASSERT(found != 0);
- typename Map::iterator i(map_.find(content));
- *found = i != map_.end();
- if (i == map_.end()) {
- typename Map::size_type n = map_.size();
- if (n < size_) {
- i =
- (map_.insert(
- typename Map::value_type(
- content,
- Entry(
- static_cast< sal_uInt16 >(n), map_.end(),
- first_)))).
- first;
- if (first_ == map_.end()) {
- last_ = i;
- } else {
- first_->second.prev = i;
- }
- first_ = i;
- } else if (last_ != map_.end()) {
- i =
- (map_.insert(
- typename Map::value_type(
- content,
- Entry(last_->second.index, map_.end(), first_)))).
- first;
- first_->second.prev = i;
- first_ = i;
- typename Map::iterator j(last_);
- last_ = last_->second.prev;
- last_->second.next = map_.end();
- map_.erase(j);
- } else {
- // Reached iff size_ == 0:
- return cache::ignore;
- }
- } else if (i != first_) {
- // Move to front (reached only if size_ > 1):
- i->second.prev->second.next = i->second.next;
- if (i->second.next == map_.end()) {
- last_ = i->second.prev;
- } else {
- i->second.next->second.prev = i->second.prev;
- }
- i->second.prev = map_.end();
- i->second.next = first_;
- first_->second.prev = i;
- first_ = i;
- }
- return i->second.index;
+ IdxType add( const T& rContent, bool* pbFound) {
+ OSL_ASSERT( pbFound != NULL);
+ if( !size_) {
+ *pbFound = false;
+ return cache::ignore;
+ }
+ // try to insert into the map
+ list_.push_front( rContent); // create a temp entry
+ typedef std::pair<typename LruList::iterator, IdxType> MappedType;
+ typedef std::pair<typename LruItMap::iterator,bool> MapPair;
+ MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
+ *pbFound = !aMP.second;
+
+ if( !aMP.second) { // insertion not needed => found the entry
+ list_.pop_front(); // remove the temp entry
+ list_.splice( list_.begin(), list_, aMP.first->first); // the found entry is moved to front
+ return aMP.first->second;
+ }
+
+ // test insertion successful => it was new so we keep it
+ IdxType n = static_cast<IdxType>( map_.size() - 1);
+ if( n >= size_) { // cache full => replace the LRU entry
+ // find the least recently used element in the map
+ typename LruItMap::iterator it = map_.find( --list_.end());
+ n = it->second;
+ map_.erase( it); // remove it from the map
+ list_.pop_back(); // remove from the list
+ }
+ aMP.first->second = n;
+ return n;
}
private:
- struct Entry;
-
- typedef std::map< T, Entry > Map;
-
- struct Entry {
- sal_uInt16 index;
- typename Map::iterator prev;
- typename Map::iterator next;
-
- Entry(
- sal_uInt16 theIndex, typename Map::iterator thePrev,
- typename Map::iterator theNext):
- index(theIndex), prev(thePrev), next(theNext) {}
- };
+ typedef std::list<T> LruList; // last recently used list
+ typedef typename LruList::iterator LruListIt;
+#ifdef URPCACHE_USES_UNORDERED_MAP
+ struct HashT{ size_t operator()( const LruListIt& rA) const { return hash(*rA;);};
+ struct EqualT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return *rA==*rB;}};
+ typedef ::std::unordered_map< LruListIt, IdxType, HashT, EqualT > LruItMap; // a map into a LruList
+#else
+ struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}};
+ typedef ::std::map< LruListIt, IdxType, CmpT > LruItMap; // a map into a LruList
+#endif
std::size_t size_;
- Map map_;
- typename Map::iterator first_;
- typename Map::iterator last_;
+ LruItMap map_;
+ LruList list_;
};
}
#endif
+
Modified: openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.cxx (original)
+++ openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.cxx Wed Dec 18 13:27:09 2013
@@ -36,14 +36,38 @@
namespace com { namespace sun { namespace star { namespace uno {
-bool operator <(TypeDescription const & left, TypeDescription const & right) {
- OSL_ASSERT(left.is() && right.is());
- typelib_TypeClass tc1 = left.get()->eTypeClass;
- typelib_TypeClass tc2 = right.get()->eTypeClass;
- return tc1 < tc2 ||
- (tc1 == tc2 &&
- (rtl::OUString(left.get()->pTypeName) <
- rtl::OUString(right.get()->pTypeName)));
+bool operator<( const TypeDescription& rLeft, const TypeDescription& rRight) {
+ OSL_ASSERT( rLeft.is() && rRight.is());
+ const typelib_TypeDescription& rA = *rLeft.get();
+ const typelib_TypeDescription& rB = *rRight.get();
+ if( rA.eTypeClass != rA.eTypeClass)
+ return (rA.eTypeClass < rB.eTypeClass);
+ const sal_Int32 nCmp = rtl_ustr_compare_WithLength(
+ rA.pTypeName->buffer, rA.pTypeName->length,
+ rB.pTypeName->buffer, rB.pTypeName->length);
+ return (nCmp < 0);
+}
+
+bool TypeDescEqual::operator()( const TypeDescription& rLeft, const TypeDescription& rRight) const
+{
+ OSL_ASSERT( rLeft.is() && rRight.is());
+ const typelib_TypeDescription& rA = *rLeft.get();
+ const typelib_TypeDescription& rB = *rRight.get();
+ if( rA.eTypeClass != rB.eTypeClass)
+ return false;
+ const sal_Int32 nCmp = rtl_ustr_compare_WithLength(
+ rA.pTypeName->buffer, rA.pTypeName->length,
+ rB.pTypeName->buffer, rB.pTypeName->length);
+ return (nCmp == 0);
+}
+
+sal_Int32 TypeDescHash::operator()( const TypeDescription& rTD) const
+{
+ OSL_ASSERT( rTD.is());
+ const typelib_TypeDescription& rA = *rTD.get();
+ sal_Int32 h = rtl_ustr_hashCode_WithLength( rA.pTypeName->buffer, rA.pTypeName->length);
+ h ^= static_cast<sal_Int32>(rA.eTypeClass);
+ return h;
}
} } } }
@@ -51,8 +75,8 @@ bool operator <(TypeDescription const &
namespace rtl {
bool operator <(ByteSequence const & left, ByteSequence const & right) {
- for (sal_Int32 i = 0; i != std::min(left.getLength(), right.getLength());
- ++i)
+ const sal_Int32 nLen = std::min( left.getLength(), right.getLength());
+ for( sal_Int32 i = 0; i < nLen; ++i )
{
if (left[i] < right[i]) {
return true;
@@ -65,3 +89,4 @@ bool operator <(ByteSequence const & lef
}
}
+
Modified: openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.hxx (original)
+++ openoffice/branches/ooxml-osba/main/binaryurp/source/lessoperators.hxx Wed Dec 18 13:27:09 2013
@@ -35,6 +35,10 @@ namespace com { namespace sun { namespac
bool operator <(TypeDescription const & left, TypeDescription const & right);
+struct TypeDescHash { sal_Int32 operator()( const TypeDescription&) const; };
+
+struct TypeDescEqual { bool operator()( const TypeDescription&, const TypeDescription&) const; };
+
} } } }
namespace rtl {
Modified: openoffice/branches/ooxml-osba/main/bridges/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/bridges/prj/build.lst?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/bridges/prj/build.lst (original)
+++ openoffice/branches/ooxml-osba/main/bridges/prj/build.lst Wed Dec 18 13:27:09 2013
@@ -22,7 +22,7 @@ br bridges\source\cpp_uno\gcc3_linux_hpp
br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u br_gcc3ll br_unotypes NULL
br bridges\source\cpp_uno\gcc3_macosx_intel nmake - u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake - u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
-br bridges\source\cpp_uno\cxx_macosx_x86-64 nmake - u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\s5abi_macosx_x86-64 nmake - u br_cxxmacoxx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
br bridges\source\cpp_uno\cc5_solaris_sparc64 nmake - u br_cc5sols64 br_unotypes br_cppuno_shared br_inc NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes br_cppuno_shared br_inc NULL
Modified: openoffice/branches/ooxml-osba/main/bridges/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/bridges/prj/d.lst?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/bridges/prj/d.lst (original)
+++ openoffice/branches/ooxml-osba/main/bridges/prj/d.lst Wed Dec 18 13:27:09 2013
@@ -6,6 +6,6 @@
..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
-..\%__SRC%\lib\libcxx_uno.* %_DEST%\lib%_EXT%\libcxx_uno.*
+..\%__SRC%\lib\libs5abi_uno.* %_DEST%\lib%_EXT%\libs5abi_uno.*
..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
Modified: openoffice/branches/ooxml-osba/main/chart2/source/controller/accessibility/AccessibleBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/chart2/source/controller/accessibility/AccessibleBase.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/chart2/source/controller/accessibility/AccessibleBase.cxx (original)
+++ openoffice/branches/ooxml-osba/main/chart2/source/controller/accessibility/AccessibleBase.cxx Wed Dec 18 13:27:09 2013
@@ -651,9 +651,7 @@ sal_Int32 SAL_CALL AccessibleBase::getAc
sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole()
throw (RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
return AccessibleRole::SHAPE/*LIST_ITEM*/; // #i73747# role SHAPE seems more appropriate, but is not read
- //-----IAccessibility2 Implementation 2009
}
Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet()
Modified: openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/res_LegendPosition.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/res_LegendPosition.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/res_LegendPosition.hxx (original)
+++ openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/res_LegendPosition.hxx Wed Dec 18 13:27:09 2013
@@ -63,8 +63,7 @@ public:
DECL_LINK( PositionEnableHdl, void* );
DECL_LINK( PositionChangeHdl, RadioButton* );
- void SetAccessibleRelationMemberOf(Window* pMemberOf); //IAccessibility2 Implementation 2009-----
-
+ void SetAccessibleRelationMemberOf(Window* pMemberOf);
private:
void impl_setRadioButtonToggleHdl();
Modified: openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc (original)
+++ openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc Wed Dec 18 13:27:09 2013
@@ -38,7 +38,5 @@
#define BTN_LIGHT_6 8
#define BTN_LIGHT_7 9
#define BTN_LIGHT_8 10
-//IAccessibility2 Implementation 2009-----
#define STR_LIGHT_PREVIEW 6000
-//-----IAccessibility2 Implementation 2009
#define CTL_LIGHT_PREVIEW 1
Modified: openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_DataSource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_DataSource.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_DataSource.cxx (original)
+++ openoffice/branches/ooxml-osba/main/chart2/source/controller/dialogs/tp_DataSource.cxx Wed Dec 18 13:27:09 2013
@@ -69,13 +69,7 @@ const OUString lcl_aLabelRole( RTL_CONST
String lcl_GetRoleLBEntry(
const OUString & rRole, const OUString & rRange )
{
-//IAccessibility2 Implementation 2009-----
- //String aEntry( rRole );
- //aEntry += '\t';
- //aEntry += String(
- // ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
- //-----IAccessibility2 Implementation 2009
aEntry += '\t';
aEntry += String( rRange );
@@ -142,12 +136,10 @@ OUString lcl_GetSequenceNameForLabel( ::
return aResult;
}
-//IAccessibility2 Implementation 2009-----
static long lcl_pRoleListBoxTabs[] =
{ 2, // Number of Tabs
0, 75
};
-//-----IAccessibility2 Implementation 2009
void lcl_ShowChooserButton(
::chart::RangeSelectionButton & rChooserButton,
Modified: openoffice/branches/ooxml-osba/main/chart2/source/inc/Strings.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/chart2/source/inc/Strings.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/chart2/source/inc/Strings.hrc (original)
+++ openoffice/branches/ooxml-osba/main/chart2/source/inc/Strings.hrc Wed Dec 18 13:27:09 2013
@@ -338,10 +338,8 @@
#define STR_TEXT_DIRECTION_RTL (RID_APP_START + 279)
#define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280)
-//IAccessibility2 Implementation 2009-----
#define STR_BUTTON_UP (RID_APP_START + 500)
#define STR_BUTTON_DOWN (RID_APP_START + 501)
-//-----IAccessibility2 Implementation 2009
//-----------------------------------------------------------------------------
/*
////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34)
Modified: openoffice/branches/ooxml-osba/main/cli_ure/source/climaker/climaker_app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cli_ure/source/climaker/climaker_app.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cli_ure/source/climaker/climaker_app.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cli_ure/source/climaker/climaker_app.cxx Wed Dec 18 13:27:09 2013
@@ -567,7 +567,7 @@ SAL_IMPLEMENT_MAIN()
// setup assembly info: xxx todo set more? e.g. avoid strong versioning
AssemblyName * assembly_name = new AssemblyName();
assembly_name->set_CodeBase( output_dir );
- assembly_name->set_Name( name );
+ assembly_name->set_Name( name.getStr() );
if (kp != NULL)
assembly_name->set_KeyPair(kp);
Modified: openoffice/branches/ooxml-osba/main/cli_ure/source/uno_bridge/cli_data.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cli_ure/source/uno_bridge/cli_data.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cli_ure/source/uno_bridge/cli_data.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cli_ure/source/uno_bridge/cli_data.cxx Wed Dec 18 13:27:09 2013
@@ -598,7 +598,7 @@ System::String* mapPolymorphicName(Syste
index = cur;
if (bCliToUno)
{
- builder->Append(mapCliTypeName(sParam));
+ builder->Append( mapCliTypeName(sParam).getStr());
}
else
{
Modified: openoffice/branches/ooxml-osba/main/comphelper/inc/comphelper/locale.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/comphelper/inc/comphelper/locale.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/comphelper/inc/comphelper/locale.hxx (original)
+++ openoffice/branches/ooxml-osba/main/comphelper/inc/comphelper/locale.hxx Wed Dec 18 13:27:09 2013
@@ -64,41 +64,41 @@ class COMPHELPER_DLLPUBLIC Locale
static const sal_Unicode SEPERATOR_CV_LINUX;
/** @short some predefined Locale objects. */
- static const Locale EN_US();
- static const Locale EN();
- static const Locale DE_DE();
- static const Locale DE_CH();
- static const Locale DE_AT();
- static const Locale AR();
- static const Locale CA();
- static const Locale CS();
- static const Locale DA();
- static const Locale EL();
- static const Locale ES();
- static const Locale FI();
- static const Locale FR();
- static const Locale HE();
- static const Locale HI_IN();
- static const Locale HU();
- static const Locale IT();
- static const Locale JA();
- static const Locale KO();
- static const Locale NL();
- static const Locale PL();
- static const Locale PT();
- static const Locale PT_BR();
- static const Locale RU();
- static const Locale SK();
- static const Locale SL();
- static const Locale SV();
- static const Locale TH();
- static const Locale TR();
- static const Locale X_DEFAULT();
- static const Locale X_COMMENT();
- static const Locale X_TRANSLATE();
- static const Locale X_NOTRANSLATE();
- static const Locale ZH_CN();
- static const Locale ZH_TW();
+ static const Locale& EN_US();
+ static const Locale& EN();
+ static const Locale& DE_DE();
+ static const Locale& DE_CH();
+ static const Locale& DE_AT();
+ static const Locale& AR();
+ static const Locale& CA();
+ static const Locale& CS();
+ static const Locale& DA();
+ static const Locale& EL();
+ static const Locale& ES();
+ static const Locale& FI();
+ static const Locale& FR();
+ static const Locale& HE();
+ static const Locale& HI_IN();
+ static const Locale& HU();
+ static const Locale& IT();
+ static const Locale& JA();
+ static const Locale& KO();
+ static const Locale& NL();
+ static const Locale& PL();
+ static const Locale& PT();
+ static const Locale& PT_BR();
+ static const Locale& RU();
+ static const Locale& SK();
+ static const Locale& SL();
+ static const Locale& SV();
+ static const Locale& TH();
+ static const Locale& TR();
+ static const Locale& X_DEFAULT();
+ static const Locale& X_COMMENT();
+ static const Locale& X_TRANSLATE();
+ static const Locale& X_NOTRANSLATE();
+ static const Locale& ZH_CN();
+ static const Locale& ZH_TW();
//-------------------------------------------
// types
Modified: openoffice/branches/ooxml-osba/main/comphelper/source/misc/locale.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/comphelper/source/misc/locale.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/comphelper/source/misc/locale.cxx (original)
+++ openoffice/branches/ooxml-osba/main/comphelper/source/misc/locale.cxx Wed Dec 18 13:27:09 2013
@@ -40,7 +40,7 @@ const sal_Unicode Locale::SEPERATOR_CV
const sal_Unicode Locale::SEPERATOR_CV_LINUX = (sal_Unicode)'.';
//-----------------------------------------------
-const Locale Locale::X_DEFAULT()
+const Locale& Locale::X_DEFAULT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -49,7 +49,7 @@ const Locale Locale::X_DEFAULT()
}
//-----------------------------------------------
-const Locale Locale::EN()
+const Locale& Locale::EN()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("en"),
@@ -58,7 +58,7 @@ const Locale Locale::EN()
}
//-----------------------------------------------
-const Locale Locale::EN_US()
+const Locale& Locale::EN_US()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("en"),
@@ -67,7 +67,7 @@ const Locale Locale::EN_US()
}
//-----------------------------------------------
-const Locale Locale::DE_DE()
+const Locale& Locale::DE_DE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("de"),
@@ -76,7 +76,7 @@ const Locale Locale::DE_DE()
}
//-----------------------------------------------
-const Locale Locale::DE_CH()
+const Locale& Locale::DE_CH()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("de"),
@@ -85,7 +85,7 @@ const Locale Locale::DE_CH()
}
//-----------------------------------------------
-const Locale Locale::DE_AT()
+const Locale& Locale::DE_AT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("de"),
@@ -94,7 +94,7 @@ const Locale Locale::DE_AT()
}
//-----------------------------------------------
-const Locale Locale::AR()
+const Locale& Locale::AR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ar"),
@@ -103,7 +103,7 @@ const Locale Locale::AR()
}
//-----------------------------------------------
-const Locale Locale::CA()
+const Locale& Locale::CA()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ca"),
@@ -112,7 +112,7 @@ const Locale Locale::CA()
}
//-----------------------------------------------
-const Locale Locale::CS()
+const Locale& Locale::CS()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("cs"),
@@ -121,7 +121,7 @@ const Locale Locale::CS()
}
//-----------------------------------------------
-const Locale Locale::DA()
+const Locale& Locale::DA()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("da"),
@@ -130,7 +130,7 @@ const Locale Locale::DA()
}
//-----------------------------------------------
-const Locale Locale::EL()
+const Locale& Locale::EL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("el"),
@@ -139,7 +139,7 @@ const Locale Locale::EL()
}
//-----------------------------------------------
-const Locale Locale::ES()
+const Locale& Locale::ES()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("es"),
@@ -148,7 +148,7 @@ const Locale Locale::ES()
}
//-----------------------------------------------
-const Locale Locale::FI()
+const Locale& Locale::FI()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("fi"),
@@ -157,7 +157,7 @@ const Locale Locale::FI()
}
//-----------------------------------------------
-const Locale Locale::FR()
+const Locale& Locale::FR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("fr"),
@@ -166,7 +166,7 @@ const Locale Locale::FR()
}
//-----------------------------------------------
-const Locale Locale::HE()
+const Locale& Locale::HE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("he"),
@@ -175,7 +175,7 @@ const Locale Locale::HE()
}
//-----------------------------------------------
-const Locale Locale::HI_IN()
+const Locale& Locale::HI_IN()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("hi"),
@@ -184,7 +184,7 @@ const Locale Locale::HI_IN()
}
//-----------------------------------------------
-const Locale Locale::HU()
+const Locale& Locale::HU()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("hu"),
@@ -193,7 +193,7 @@ const Locale Locale::HU()
}
//-----------------------------------------------
-const Locale Locale::IT()
+const Locale& Locale::IT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("it"),
@@ -202,7 +202,7 @@ const Locale Locale::IT()
}
//-----------------------------------------------
-const Locale Locale::JA()
+const Locale& Locale::JA()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ja"),
@@ -211,7 +211,7 @@ const Locale Locale::JA()
}
//-----------------------------------------------
-const Locale Locale::KO()
+const Locale& Locale::KO()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ko"),
@@ -220,7 +220,7 @@ const Locale Locale::KO()
}
//-----------------------------------------------
-const Locale Locale::NL()
+const Locale& Locale::NL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("nl"),
@@ -229,7 +229,7 @@ const Locale Locale::NL()
}
//-----------------------------------------------
-const Locale Locale::PL()
+const Locale& Locale::PL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("pl"),
@@ -238,7 +238,7 @@ const Locale Locale::PL()
}
//-----------------------------------------------
-const Locale Locale::PT()
+const Locale& Locale::PT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("pt"),
@@ -247,7 +247,7 @@ const Locale Locale::PT()
}
//-----------------------------------------------
-const Locale Locale::PT_BR()
+const Locale& Locale::PT_BR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("pt"),
@@ -256,7 +256,7 @@ const Locale Locale::PT_BR()
}
//-----------------------------------------------
-const Locale Locale::RU()
+const Locale& Locale::RU()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ru"),
@@ -265,7 +265,7 @@ const Locale Locale::RU()
}
//-----------------------------------------------
-const Locale Locale::SK()
+const Locale& Locale::SK()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("sk"),
@@ -274,7 +274,7 @@ const Locale Locale::SK()
}
//-----------------------------------------------
-const Locale Locale::SL()
+const Locale& Locale::SL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("sl"),
@@ -283,7 +283,7 @@ const Locale Locale::SL()
}
//-----------------------------------------------
-const Locale Locale::SV()
+const Locale& Locale::SV()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("sv"),
@@ -292,7 +292,7 @@ const Locale Locale::SV()
}
//-----------------------------------------------
-const Locale Locale::TH()
+const Locale& Locale::TH()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("th"),
@@ -301,7 +301,7 @@ const Locale Locale::TH()
}
//-----------------------------------------------
-const Locale Locale::TR()
+const Locale& Locale::TR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("tr"),
@@ -310,7 +310,7 @@ const Locale Locale::TR()
}
//-----------------------------------------------
-const Locale Locale::X_COMMENT()
+const Locale& Locale::X_COMMENT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -319,7 +319,7 @@ const Locale Locale::X_COMMENT()
}
//-----------------------------------------------
-const Locale Locale::X_TRANSLATE()
+const Locale& Locale::X_TRANSLATE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -328,7 +328,7 @@ const Locale Locale::X_TRANSLATE()
}
//-----------------------------------------------
-const Locale Locale::X_NOTRANSLATE()
+const Locale& Locale::X_NOTRANSLATE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -337,7 +337,7 @@ const Locale Locale::X_NOTRANSLATE()
}
//-----------------------------------------------
-const Locale Locale::ZH_CN()
+const Locale& Locale::ZH_CN()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("zh"),
@@ -346,7 +346,7 @@ const Locale Locale::ZH_CN()
}
//-----------------------------------------------
-const Locale Locale::ZH_TW()
+const Locale& Locale::ZH_TW()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("zh"),
Modified: openoffice/branches/ooxml-osba/main/comphelper/source/misc/namedvaluecollection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/comphelper/source/misc/namedvaluecollection.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/comphelper/source/misc/namedvaluecollection.cxx (original)
+++ openoffice/branches/ooxml-osba/main/comphelper/source/misc/namedvaluecollection.cxx Wed Dec 18 13:27:09 2013
@@ -222,7 +222,7 @@ namespace comphelper
::rtl::OStringBuffer message;
message.append( "NamedValueCollection::impl_assign: encountered a value type which I cannot handle:\n" );
message.append( ::rtl::OUStringToOString( pArgument->getValueTypeName(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_ENSURE( false, message.makeStringAndClear() );
+ OSL_ENSURE( false, message.getStr() );
}
#endif
}
Modified: openoffice/branches/ooxml-osba/main/configmgr/source/modifications.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/configmgr/source/modifications.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/configmgr/source/modifications.hxx (original)
+++ openoffice/branches/ooxml-osba/main/configmgr/source/modifications.hxx Wed Dec 18 13:27:09 2013
@@ -26,20 +26,19 @@
#include "sal/config.h"
-#include <map>
+#include <boost/unordered_map.hpp> // using the boost container because it explicitly allows recursive types
#include "boost/noncopyable.hpp"
#include "path.hxx"
-
-namespace rtl { class OUString; }
+#include "rtl/ustring.hxx"
namespace configmgr {
class Modifications: private boost::noncopyable {
public:
struct Node {
- typedef std::map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
Children children;
};
Modified: openoffice/branches/ooxml-osba/main/connectivity/inc/connectivity/CommonTools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/inc/connectivity/CommonTools.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/inc/connectivity/CommonTools.hxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/inc/connectivity/CommonTools.hxx Wed Dec 18 13:27:09 2013
@@ -49,6 +49,10 @@ namespace connectivity
{
//------------------------------------------------------------------------------
OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape);
+ inline sal_Bool match( const rtl::OUString& rWild, const sal_Unicode* pStr, sal_Unicode cEscape)
+ { return match( rWild.getStr(), pStr, cEscape); }
+ inline sal_Bool match( const rtl::OUString& rWild, const rtl::OUString& rStr, sal_Unicode cEscape)
+ { return match( rWild, rStr.getStr(), cEscape); }
//------------------------------------------------------------------------------
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const ::com::sun::star::uno::Any& rValue);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate);
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/commontools/CommonTools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/commontools/CommonTools.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/commontools/CommonTools.cxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/commontools/CommonTools.cxx Wed Dec 18 13:27:09 2013
@@ -280,7 +280,7 @@ namespace connectivity
{
::rtl::OString sClassName = ::rtl::OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US);
sClassName = sClassName.replace('.','/');
- jobject out = pEnv->FindClass(sClassName);
+ jobject out = pEnv->FindClass( sClassName.getStr());
bRet = out != NULL;
pEnv->DeleteLocalRef( out );
}
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BConnection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BConnection.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BConnection.cxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BConnection.cxx Wed Dec 18 13:27:09 2013
@@ -108,8 +108,8 @@ SQLRETURN OAdabasConnection::Construct(
}
m_sUser = aUID;
- if ( sHostName.getLength() )
- aDSN = sHostName + ':' + aDSN;
+ if( !sHostName.isEmpty() )
+ aDSN = sHostName + ::rtl::OUString::createFromAscii(":") + aDSN;
SQLRETURN nSQLRETURN = openConnectionWithAuth(aDSN,nTimeout, aUID,aPWD);
return nSQLRETURN;
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BDriver.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BDriver.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BDriver.cxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/drivers/adabas/BDriver.cxx Wed Dec 18 13:27:09 2013
@@ -44,6 +44,9 @@
#include <memory>
#include <sys/stat.h>
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
+inline SvStream& operator<<( SvStream& s, const rtl::OUString r) { return (s << ::rtl::OUStringToOString(r,gsl_getSystemTextEncoding())); }
+
#if defined(UNX)
const char sNewLine = '\012';
#else
@@ -959,7 +962,7 @@ void ODriver::createDb( const TDatabaseS
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(aInitFile.GetURL(),STREAM_WRITE) );
(*pFileStream) << "ALTER USER \""
- << ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding())
+ << _aInfo.sSysUser
<< "\" NOT EXCLUSIVE "
<< sNewLine;
pFileStream->Flush();
@@ -989,13 +992,13 @@ int ODriver::X_PARAM(const ::rtl::OUStri
<< ".exe"
#endif
<< " -d "
- << ::rtl::OString(_DBNAME,_DBNAME.getLength(),gsl_getSystemTextEncoding())
+ << _DBNAME
<< " -u "
- << ::rtl::OString(_USR,_USR.getLength(),gsl_getSystemTextEncoding())
+ << _USR
<< ","
- << ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
+ << _PWD
<< " "
- << ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
+ << _CMD
#if defined(WNT)
#if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
<< " >> %DBWORK%\\create.log 2>&1"
@@ -1197,15 +1200,15 @@ void ODriver::XUTIL(const ::rtl::OUStrin
"utility"
#endif
<< " -u "
- << ::rtl::OString(_USRNAME,_USRNAME.getLength(),gsl_getSystemTextEncoding())
+ << _USRNAME
<< ","
- << ::rtl::OString(_USRPWD,_USRPWD.getLength(),gsl_getSystemTextEncoding())
+ << _USRPWD
<< " -d "
- << ::rtl::OString(_DBNAME,_DBNAME.getLength(),gsl_getSystemTextEncoding())
+ << _DBNAME
<< " "
- << ::rtl::OString(_rParam,_rParam.getLength(),gsl_getSystemTextEncoding())
+ << _rParam
<< " > "
- << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+ << sPhysicalPath
<< " 2>&1"
<< sNewLine;
pFileStream->Flush();
@@ -1248,20 +1251,20 @@ void ODriver::LoadBatch(const ::rtl::OUS
<< ".exe"
#endif
<< " -d "
- << ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+ << sDBName
<< " -u "
- << ::rtl::OString(_rUSR,_rUSR.getLength(),gsl_getSystemTextEncoding())
+ << _rUSR
<< ","
- << ::rtl::OString(_rPWD,_rPWD.getLength(),gsl_getSystemTextEncoding());
+ << _rPWD;
if ( !isKernelVersion(CURRENT_DB_VERSION) )
(*pFileStream) << " -S adabas -b ";
else
(*pFileStream) << " -S NATIVE -b ";
- (*pFileStream) << ::rtl::OString(_rBatch,_rBatch.getLength(),gsl_getSystemTextEncoding())
+ (*pFileStream) << _rBatch
<< " > "
- << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+ << sPhysicalPath
<< " 2>&1"
<< sNewLine;
@@ -1378,7 +1381,7 @@ void ODriver::fillEnvironmentVariables()
{
String sTemp;
LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sSysDevSpace,sTemp);
- (*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+ (*pFileStream) << sTemp;
}
(*pFileStream) << "\n* log devspace size:\n";
(*pFileStream) << ::rtl::OString::valueOf(_aDBInfo.nLogSize);
@@ -1386,7 +1389,7 @@ void ODriver::fillEnvironmentVariables()
{
String sTemp;
LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sTransLogName,sTemp);
- (*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+ (*pFileStream) << sTemp;
}
(*pFileStream) << "\n* data devspace size:\n";
(*pFileStream) << ::rtl::OString::valueOf(_aDBInfo.nDataSize);
@@ -1394,7 +1397,7 @@ void ODriver::fillEnvironmentVariables()
{
String sTemp;
LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sDataDevName,sTemp);
- (*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+ (*pFileStream) << sTemp;
}
(*pFileStream) << "\n* END INIT CONFIG\n";
@@ -1405,7 +1408,7 @@ void ODriver::fillEnvironmentVariables()
{
String sTemp;
LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sBackupFile,sTemp);
- (*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+ (*pFileStream) << sTemp;
}
(*pFileStream) << "' BLOCKSIZE 8\n";
(*pFileStream) << "if $rc <> 0 then stop\n";
@@ -1415,9 +1418,9 @@ void ODriver::fillEnvironmentVariables()
else
{
(*pFileStream) << "ACTIVATE SERVERDB SYSDBA \"";
- (*pFileStream) << ::rtl::OString(_aDBInfo.sSysUser,_aDBInfo.sSysUser.getLength(),gsl_getSystemTextEncoding());
+ (*pFileStream) << _aDBInfo.sSysUser;
(*pFileStream) << "\" PASSWORD \"";
- (*pFileStream) << ::rtl::OString(_aDBInfo.sSysPassword,_aDBInfo.sSysPassword.getLength(),gsl_getSystemTextEncoding());
+ (*pFileStream) << _aDBInfo.sSysPassword;
(*pFileStream) << "\"\n";
}
(*pFileStream) << "if $rc <> 0 then stop\n";
@@ -1441,11 +1444,11 @@ void ODriver::X_CONS(const ::rtl::OUStri
<< ".exe"
#endif
<< " "
- << ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+ << sDBName
<< " SHOW "
<< _ACTION
<< " > "
- << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+ << sPhysicalPath
<< sNewLine;
pFileStream->Flush();
}
@@ -1524,9 +1527,9 @@ sal_Bool ODriver::isVersion(const ::rtl:
<< ".exe"
#endif
<< " "
- << ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+ << sDBName
<< " KERNELVERSION > "
- << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+ << sPhysicalPath
<< sNewLine;
}
@@ -1574,9 +1577,9 @@ void ODriver::checkAndInsertNewDevSpace(
<< ".exe"
#endif
<< " "
- << ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+ << sDBName
<< " DATA_CACHE_PAGES > "
- << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+ << sPhysicalPath
<< sNewLine;
}
@@ -1621,7 +1624,7 @@ sal_Bool ODriver::isKernelVersion(const
(*pFileStream) << "dbversion"
<< " > "
- << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+ << sPhysicalPath
<< sNewLine;
}
@@ -1731,13 +1734,13 @@ void ODriver::installSystemTables( const
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) << "x_dbinst"
<< " -d "
- << ::rtl::OString(_aInfo.sDBName,_aInfo.sDBName.getLength(),gsl_getSystemTextEncoding())
+ << _aInfo.sDBName
<< " -u "
- << ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding())
+ << _aInfo.sSysUser
<< ","
- << ::rtl::OString(_aInfo.sSysPassword,_aInfo.sSysPassword.getLength(),gsl_getSystemTextEncoding())
+ << _aInfo.sSysPassword
<< " -w "
- << ::rtl::OString(_aInfo.sDomainPassword,_aInfo.sDomainPassword.getLength(),gsl_getSystemTextEncoding())
+ << _aInfo.sDomainPassword
<< " -b ";
if ( isKernelVersion(ADABAS_KERNEL_11) )
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/drivers/jdbc/Class.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/drivers/jdbc/Class.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/drivers/jdbc/Class.cxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/drivers/jdbc/Class.cxx Wed Dec 18 13:27:09 2013
@@ -53,7 +53,7 @@ java_lang_Class * java_lang_Class::forNa
{
::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8);
sClassName = sClassName.replace('.','/');
- out = t.pEnv->FindClass(sClassName);
+ out = t.pEnv->FindClass( sClassName.getStr());
ThrowSQLException(t.pEnv,0);
} //t.pEnv
// ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx Wed Dec 18 13:27:09 2013
@@ -879,7 +879,7 @@ void ODatabaseMetaDataResultSet::openTab
const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
- *pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr();
+ *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr();
const char *pCOL = NULL;
@@ -981,8 +981,8 @@ void ODatabaseMetaDataResultSet::openCol
const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
- *pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr(),
- *pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+ *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(),
+ *pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
SQLRETURN nRetcode = N3SQLColumnPrivileges(m_aStatementHandle,
@@ -1014,8 +1014,8 @@ void ODatabaseMetaDataResultSet::openCol
const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && pSchemaPat->getLength() && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
- *pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr(),
- *pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+ *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(),
+ *pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
SQLRETURN nRetcode = N3SQLColumns(m_aStatementHandle,
@@ -1081,8 +1081,8 @@ void ODatabaseMetaDataResultSet::openPro
const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
- *pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr(),
- *pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+ *pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr(),
+ *pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
SQLRETURN nRetcode = N3SQLProcedureColumns(m_aStatementHandle,
@@ -1115,7 +1115,7 @@ void ODatabaseMetaDataResultSet::openPro
const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
- *pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr();
+ *pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr();
SQLRETURN nRetcode = N3SQLProcedures(m_aStatementHandle,
@@ -1145,7 +1145,7 @@ void ODatabaseMetaDataResultSet::openSpe
const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL,
*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
- *pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr();
+ *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr();
SQLRETURN nRetcode = N3SQLSpecialColumns(m_aStatementHandle,_bRowVer ? SQL_ROWVER : SQL_BEST_ROWID,
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlflex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlflex.l?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlflex.l (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlflex.l Wed Dec 18 13:27:09 2013
@@ -784,7 +784,7 @@ void OSQLScanner::prepareScan(const ::rt
BEGIN(m_nRule);
m_sErrorMessage = ::rtl::OUString();
- m_sStatement = ::rtl::OString(rNewStatement,rNewStatement.getLength(), RTL_TEXTENCODING_UTF8);
+ m_sStatement = ::rtl::OUStringToOString( rNewStatement, RTL_TEXTENCODING_UTF8);
m_nCurrentPos = 0;
m_bInternational = bInternational;
m_pContext = pContext;
Modified: openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlnode.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlnode.cxx (original)
+++ openoffice/branches/ooxml-osba/main/connectivity/source/parse/sqlnode.cxx Wed Dec 18 13:27:09 2013
@@ -1576,7 +1576,7 @@ OSQLParseNode::OSQLParseNode(const ::rtl
SQLNodeType eNewNodeType,
sal_uInt32 nNewNodeID)
:m_pParent(NULL)
- ,m_aNodeValue(_rNewValue,_rNewValue.getLength(),RTL_TEXTENCODING_UTF8)
+ ,m_aNodeValue( rtl::OStringToOUString( _rNewValue, RTL_TEXTENCODING_UTF8))
,m_eNodeType(eNewNodeType)
,m_nNodeID(nNewNodeID)
{
@@ -2465,7 +2465,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUS
rString.appendAscii(" ");
const ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext : NULL);
- rString.append(::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8));
+ rString.append( ::rtl::OStringToOUString( sT, RTL_TEXTENCODING_UTF8));
} break;
case SQL_NODE_STRING:
if (rString.getLength())
@@ -2550,7 +2550,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUS
sal_Int32 OSQLParser::getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext)
{
sal_Int32 nType = DataType::VARCHAR;
- ::rtl::OString sFunctionName(_sFunctionName,_sFunctionName.getLength(),RTL_TEXTENCODING_UTF8);
+ ::rtl::OString sFunctionName( rtl::OUStringToOString( _sFunctionName, RTL_TEXTENCODING_UTF8));
if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ASCII,pContext))) nType = DataType::INTEGER;
else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_BIT_LENGTH,pContext))) nType = DataType::INTEGER;
Modified: openoffice/branches/ooxml-osba/main/cppuhelper/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cppuhelper/source/makefile.mk?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cppuhelper/source/makefile.mk (original)
+++ openoffice/branches/ooxml-osba/main/cppuhelper/source/makefile.mk Wed Dec 18 13:27:09 2013
@@ -60,6 +60,7 @@ UNOTYPES= \
com.sun.star.bridge.UnoUrlResolver \
com.sun.star.bridge.XUnoUrlResolver \
com.sun.star.connection.SocketPermission \
+ com.sun.star.container.XContentEnumerationAccess \
com.sun.star.container.XElementAccess \
com.sun.star.container.XEnumerationAccess \
com.sun.star.container.XHierarchicalNameAccess \
@@ -177,7 +178,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
SHL1VERSIONMAP=gcc3os2.map
-#.ELIF "$(COMNAME)"=="gcc3" || "$(COMNAME)"=="Clang"
.ELSE
SHL1VERSIONMAP=gcc3.map
.ENDIF
Modified: openoffice/branches/ooxml-osba/main/cppuhelper/source/primeweak.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cppuhelper/source/primeweak.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cppuhelper/source/primeweak.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cppuhelper/source/primeweak.cxx Wed Dec 18 13:27:09 2013
@@ -64,6 +64,7 @@
#include "cppuhelper/com/sun/star/beans/PropertyValue.hpp"
#include "cppuhelper/com/sun/star/beans/XPropertySet.hpp"
#include "cppuhelper/com/sun/star/beans/XMultiPropertySet.hpp"
+#include "cppuhelper/com/sun/star/container/XContentEnumerationAccess.hpp"
#include "cppuhelper/com/sun/star/container/XEnumerationAccess.hpp"
#include "cppuhelper/com/sun/star/container/XEnumeration.hpp"
#include "cppuhelper/com/sun/star/container/XNameAccess.hpp"
@@ -117,6 +118,7 @@ void primeWeakMap( void)
InitTypeDesc( com::sun::star::container::XElementAccess );
InitTypeDesc( com::sun::star::container::XEnumeration );
InitTypeDesc( com::sun::star::container::XEnumerationAccess );
+ InitTypeDesc( com::sun::star::container::XContentEnumerationAccess );
InitTypeDesc( com::sun::star::container::XHierarchicalNameAccess );
InitTypeDesc( com::sun::star::container::XNameAccess );
InitTypeDesc( com::sun::star::container::XNameReplace );
Modified: openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.cxx Wed Dec 18 13:27:09 2013
@@ -1662,7 +1662,6 @@ SvxConfigPage::SvxConfigPage(
aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
aDescriptionField.SetAutoScroll( sal_True );
aDescriptionField.EnableCursor( sal_False );
- //IAccessibility2 Implementation 2009-----
aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
@@ -1671,7 +1670,6 @@ SvxConfigPage::SvxConfigPage(
aModifyTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
aAddCommandsButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
aModifyCommandButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
- //-----IAccessibility2 Implementation 2009
}
SvxConfigPage::~SvxConfigPage()
@@ -2930,10 +2928,8 @@ SvxMainMenuOrganizerDialog::SvxMainMenuO
LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
aMoveDownButton.SetClickHdl (
LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
- //IAccessibility2 Implementation 2009-----
aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
- //-----IAccessibility2 Implementation 2009
}
IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
Modified: openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.hrc Wed Dec 18 13:27:09 2013
@@ -100,7 +100,5 @@
#define MD_BTN_OK (122 + CFG_OFFSET)
#define FI_INFO (123 + CFG_OFFSET)
-//IAccessibility2 Implementation 2009-----
#define BUTTON_STR_UP (130 + CFG_OFFSET)
#define BUTTON_STR_DOWN (131 + CFG_OFFSET)
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.src?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.src (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/customize/cfg.src Wed Dec 18 13:27:09 2013
@@ -822,7 +822,6 @@ String RID_SVXSTR_RENAME_TOOLBAR
{
Text [ en-US ] = "Rename Toolbar";
};
-//IAccessibility2 Implementation 2009-----
String BUTTON_STR_UP
{
Text [ en-US ] = "Up";
@@ -831,5 +830,4 @@ String BUTTON_STR_DOWN
{
Text [ en-US ] = "Down";
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/cui/source/customize/macropg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/customize/macropg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/customize/macropg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/customize/macropg.cxx Wed Dec 18 13:27:09 2013
@@ -162,8 +162,8 @@ long _HeaderTabListBox::Notify( NotifyEv
_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
Control( pParent, rId ),
- maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
- maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+ maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
+ maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
{
maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
Modified: openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuicharmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuicharmap.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuicharmap.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuicharmap.cxx Wed Dec 18 13:27:09 2013
@@ -257,7 +257,12 @@ SvxShowText::~SvxShowText()
SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext )
: mpDialog( pDialog ),
+ aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ),
+ aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ),
+ aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
+ aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
+ aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
// aShowShortcut ( pDialog, ResId( CT_ASSIGN, *pResContext ) ),
aOKBtn ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ),
@@ -265,11 +270,6 @@ SvxCharMapData::SvxCharMapData( SfxModal
aHelpBtn ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ),
aDeleteBtn ( pDialog, ResId( BTN_DELETE, *pResContext ) ),
// aAssignBtn ( pDialog, ResId( BT_ASSIGN, *pResContext ) ),
- aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ),
- aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ),
- aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
- aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
- aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ),
aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
// aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ),
Modified: openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuigrfflt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuigrfflt.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuigrfflt.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/dialogs/cuigrfflt.cxx Wed Dec 18 13:27:09 2013
@@ -534,9 +534,6 @@ GraphicFilterSolarize::GraphicFilterSola
maCbxInvert.Check( bInvert );
maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
- // IAccessibility2 Implementation 2009
- // maMtrThreshold.GrabFocus();
}
// -----------------------------------------------------------------------------
@@ -595,9 +592,6 @@ GraphicFilterSepia::GraphicFilterSepia(
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
- // IAccessibility2 Implementation 2009
- // maMtrSepia.GrabFocus();
}
// -----------------------------------------------------------------------------
@@ -648,9 +642,6 @@ GraphicFilterPoster::GraphicFilterPoster
maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
maNumPoster.SetValue( nPosterCount );
maNumPoster.SetModifyHdl( GetModifyHdl() );
-
- // IAccessibility2 Implementation 2009
- // maNumPoster.GrabFocus();
}
// -----------------------------------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/cui/source/dialogs/hlmarkwn.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/dialogs/hlmarkwn.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/dialogs/hlmarkwn.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/dialogs/hlmarkwn.hrc Wed Dec 18 13:27:09 2013
@@ -24,9 +24,7 @@
#define BT_APPLY 1
#define BT_CLOSE 2
#define TLB_MARK 3
-// IAccessibility2 implementation 2009. ------
#define STR_MARK_TREE 5000
-// ------ IAccessibility2 implementation 2009.
//#define HYPERLINK_BMP_EXPAND 301
//#define HYPERLINK_BMP_COLLAPSE 302
Modified: openoffice/branches/ooxml-osba/main/cui/source/dialogs/linkdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/dialogs/linkdlg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/dialogs/linkdlg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/dialogs/linkdlg.cxx Wed Dec 18 13:27:09 2013
@@ -113,12 +113,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window *
//JP 24.02.99: UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird
aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
aUpdateTimer.SetTimeout( 1000 );
- //IAccessibility2 Implementation 2009-----
// Set the ZOrder, and accessible name to the dialog's title
aTbLinks.SetZOrder(0, WINDOW_ZORDER_FIRST);
aTbLinks.SetAccessibleName(this->GetText());
aTbLinks.SetAccessibleRelationLabeledBy(&aFtFiles);
- //-----IAccessibility2 Implementation 2009
OpenSource().Hide();
Modified: openoffice/branches/ooxml-osba/main/cui/source/dialogs/showcols.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/dialogs/showcols.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/dialogs/showcols.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/dialogs/showcols.cxx Wed Dec 18 13:27:09 2013
@@ -119,7 +119,7 @@ void FmShowColsDialog::SetColumns(const
//CHINA001 xCurCol->getPropertyValue(::svxform::FM_PROP_LABEL) >>= sName;
xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName;
- sCurName = (const sal_Unicode*)sName;
+ sCurName = sName.getStr();
}
catch(...)
{
Modified: openoffice/branches/ooxml-osba/main/cui/source/factory/dlgfact.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/factory/dlgfact.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/factory/dlgfact.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/factory/dlgfact.cxx Wed Dec 18 13:27:09 2013
@@ -1900,7 +1900,7 @@ SfxAbstractInsertObjectDialog* AbstractD
if ( pDlg )
{
- pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
+ pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new AbstractInsertObjectDialog_Impl( pDlg );
}
return 0;
@@ -1913,7 +1913,7 @@ VclAbstractDialog* AbstractDialogFactory
if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
{
pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
- pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
+ pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new VclAbstractDialog_Impl( pDlg );
}
return 0;
Modified: openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.hrc Wed Dec 18 13:27:09 2013
@@ -81,8 +81,6 @@
#define CLB_EDIT_MODULES_MODULES 320
#define FT_EDIT_MODULES_NEWDICTSLINK 321
#define FL_EDIT_MODULES_BUTTONS 322
-// IAccessibility2 implementation 2009. ------
#define STR_LINGU_MODULES_EDIT 323
#define STR_LINGU_DICS_EDIT_DIC 324
#define STR_LINGU_OPTIONS_EDIT 325
-// ------ IAccessibility2 implementation 2009.
Modified: openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.src?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.src (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/options/optlingu.src Wed Dec 18 13:27:09 2013
@@ -352,7 +352,6 @@ TabPage RID_SFXPAGE_LINGU
{
Text [ en-US ] = "Edit Options";
};
- // ------ IAccessibility2 implementation 2009.
};
// end: TabPage RID_SFXPAGE_LINGU