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 [25/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/...
Modified: openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/content.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/content.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/content.cxx Wed Dec 18 13:27:09 2013
@@ -85,14 +85,12 @@
#include <numrule.hxx>
#include <swundo.hxx>
#include <ndtxt.hxx>
-//IAccessibility2 Implementation 2009-----
//#include <ndgrf.hxx>
#include <fmtcntnt.hxx>
#include <PostItMgr.hxx>
//#include <../../core/inc/flyfrm.hxx>
//#include <../../core/inc/cntfrm.hxx>
//#include <ndnotxt.hxx>
-//-----IAccessibility2 Implementation 2009
//#include <postit.hxx>
#include <postithelper.hxx>
#include <redline.hxx>
@@ -899,7 +897,7 @@ SwContentTree::SwContentTree(Window* pPa
bIsOutlineMoveable(sal_True),
bViewHasChanged(sal_False),
bIsImageListInitialized(sal_False),
- bIsKeySpace(sal_False) //IAccessibility2 Implementation 2009
+ bIsKeySpace(sal_False)
{
sal_uInt16 i;
@@ -936,7 +934,6 @@ SwContentTree::~SwContentTree()
bIsInDrag = sal_False;
}
-//IAccessibility2 Implementation 2009-----
String SwContentTree::GetEntryAltText( SvLBoxEntry* pEntry ) const
{
if( pEntry == NULL)
@@ -1108,7 +1105,6 @@ String SwContentTree::GetEntryLongDescri
return String();
}
-//-----IAccessibility2 Implementation 2009
/***************************************************************************
Drag&Drop methods
***************************************************************************/
@@ -1394,7 +1390,6 @@ void SwContentTree::RequestingChilds( S
sEntry = sSpace;
SvLBoxEntry* pChild = InsertEntry(sEntry, pParent,
sal_False, LIST_APPEND, (void*)pCnt);
- //IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
//==================================================
@@ -1416,7 +1411,6 @@ void SwContentTree::RequestingChilds( S
}
}
- //-----IAccessibility2 Implementation 2009
}
}
}
@@ -1426,7 +1420,6 @@ void SwContentTree::RequestingChilds( S
Beschreibung: Expand - Zustand fuer Inhaltstypen merken
***************************************************************************/
-//IAccessibility2 Implementation 2009-----
//Solution: Get drawing Objects by content .
SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
{
@@ -1460,7 +1453,6 @@ SdrObject* SwContentTree::GetDrawingObje
}
return pRetObj;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent )
{
@@ -2460,7 +2452,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, T
{
FindActiveTypeAndRemoveUserData();
Display(sal_True);
- //IAccessibility2 Implementation 2009-----
//Solution: Set focus
if( bIsKeySpace )
{
@@ -2468,7 +2459,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, T
ShowFocus( oldRectangle);
bIsKeySpace = sal_False;
}
- //-----IAccessibility2 Implementation 2009
}
}
else if(!pView && bIsActive && !bIsIdleClear)
@@ -2691,7 +2681,6 @@ void SwContentTree::KeyInput(const KeyE
GrabFocus();
}
}
- //IAccessibility2 Implementation 2009-----
//Solution: Make KEY_SPACE has same function as DoubleClick ,
//and realize multi-selection .
else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier())
@@ -2714,7 +2703,6 @@ void SwContentTree::KeyInput(const KeyE
SwContent* pCnt = (SwContent*)pEntry->GetUserData();
- sal_Bool bSel = sal_False;
sal_uInt16 nJumpType = pCnt->GetParent()->GetType();
switch(nJumpType)
{
@@ -2775,7 +2763,6 @@ void SwContentTree::KeyInput(const KeyE
break;
default:
nCmpId = pTemp->GetObjIdentifier();
- //IAccessibility2 Implementation 2009-----
if ( bMark )
{
SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/);
@@ -2784,7 +2771,6 @@ void SwContentTree::KeyInput(const KeyE
pDrawView->MarkObj(pTemp, pPV, sal_True);
}
}
- //-----IAccessibility2 Implementation 2009
}
//mod end
}
@@ -2812,7 +2798,6 @@ void SwContentTree::KeyInput(const KeyE
}
}
- //-----IAccessibility2 Implementation 2009
else
SvTreeListBox::KeyInput(rEvent);
@@ -3575,7 +3560,6 @@ void SwContentLBoxString::Paint( const P
rDev.DrawText( rPos, GetText() );
rDev.SetFont( aOldFont );
}
- //IAccessibility2 Implementation 2009-----
// IA2 CWS. MT: Removed for now (also in SvLBoxEntry) - only used in Sw/Sd/ScContentLBoxString, they should decide if they need this
/*
else if (pEntry->IsMarked())
@@ -3593,7 +3577,6 @@ void SwContentLBoxString::Paint( const P
rDev.DrawText( rPosStar, str);
rDev.SetFont( aOldFont );
}
- //-----IAccessibility2 Implementation 2009
*/
else
SvLBoxString::Paint( rPos, rDev, nFlags, pEntry);
@@ -3615,7 +3598,6 @@ void SwContentTree::DataChanged( cons
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 SwContentTree::GetEntryRealChildsNum( SvLBoxEntry* pParent ) const
{
// ist es ein Inhaltstyp?
@@ -3629,4 +3611,3 @@ sal_Int32 SwContentTree::GetEntryRealCh
}
return 0;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.hrc Wed Dec 18 13:27:09 2013
@@ -85,7 +85,5 @@
#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36)
#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37)
-//IAccessibility2 Implementation 2009-----
#define ST_TL_GLOBAL ST_GLOBAL_CONTEXT_FIRST +38
#define ST_TL_CONTENT ST_GLOBAL_CONTEXT_FIRST +39
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.src?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.src (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/navipi.src Wed Dec 18 13:27:09 2013
@@ -532,7 +532,6 @@ ImageList IMG_NAVI_ENTRYBMPH
NAVI_ENTRY_IDS
};
-//IAccessibility2 Implementation 2009-----
String STR_ACCESS_TL_GLOBAL
{
Text [ en-US ] = "Global View";
@@ -541,5 +540,4 @@ String STR_ACCESS_TL_CONTENT
{
Text [ en-US ] = "Content View";
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/poolfmt.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/poolfmt.src?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/poolfmt.src (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/ui/utlui/poolfmt.src Wed Dec 18 13:27:09 2013
@@ -734,7 +734,6 @@ String STR_POOLCHR_RUBYTEXT
{
Text [ en-US ] = "Rubies";
};
-//IAccessibility2 Implementation 2009-----
String STR_COLUMN_VALUESET_ITEM0
{
Text [ en-US ] = "1 column";
@@ -755,7 +754,6 @@ String STR_COLUMN_VALUESET_ITEM4
{
Text [ en-US ] = "2 columns with different size (left < right)";
};
-//-----IAccessibility2 Implementation 2009
String STR_POOLCHR_VERT_NUM
{
Text [ en-US ] = "Vertical Numbering Symbols";
Modified: openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/select.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/select.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/select.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/select.cxx Wed Dec 18 13:27:09 2013
@@ -46,11 +46,9 @@
#include <swdtflvr.hxx>
#include <crsskip.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _DOC_HXX
#include <doc.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
#if OSL_DEBUG_LEVEL > 1
#include <pam.hxx>
#endif
@@ -172,13 +170,11 @@ long SwWrtShell::SelAll()
SttSelect();
GoEnd(sal_True, &bMoveTable);
- //IAccessibility2 Implementation 2009-----
SwDoc *pDoc = GetDoc();
if ( pDoc )
{
pDoc->SetPrepareSelAll();
}
- //-----IAccessibility2 Implementation 2009
if( pStartPos )
{
pTmpCrsr = getShellCrsr( false );
Modified: openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/wrtsh1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/wrtsh1.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/wrtsh1.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/ui/wrtsh/wrtsh1.cxx Wed Dec 18 13:27:09 2013
@@ -426,7 +426,7 @@ void SwWrtShell::InsertObject( const svt
aCmd += pSlot->GetUnoName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
SfxAbstractInsertObjectDialog* pDlg =
- pFact->CreateInsertObjectDialog( GetWin(), rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
+ pFact->CreateInsertObjectDialog( GetWin(), rtl::OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
if ( pDlg )
{
pDlg->Execute();
Modified: openoffice/branches/ooxml-osba/main/testtools/source/bridgetest/multi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/testtools/source/bridgetest/multi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/testtools/source/bridgetest/multi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/testtools/source/bridgetest/multi.cxx Wed Dec 18 13:27:09 2013
@@ -34,6 +34,8 @@
#include <sstream>
+inline std::ostream& operator<<( std::ostream& s, const rtl::OUString r) { return (s << r.getStr()); }
+
namespace css = com::sun::star;
namespace {
Modified: openoffice/branches/ooxml-osba/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/inc/toolkit/awt/vclxwindows.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/inc/toolkit/awt/vclxwindows.hxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/inc/toolkit/awt/vclxwindows.hxx Wed Dec 18 13:27:09 2013
@@ -876,10 +876,8 @@ public:
class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField,
public VCLXFormattedSpinField
{
-//IAccessibility2 Impplementaton 2009-----
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
-//-----IAccessibility2 Impplementaton 2009
public:
VCLXDateField();
~VCLXDateField();
@@ -926,10 +924,8 @@ public:
class VCLXTimeField : public ::com::sun::star::awt::XTimeField,
public VCLXFormattedSpinField
{
-//IAccessibility2 Impplementaton 2009-----
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
-//-----IAccessibility2 Impplementaton 2009
public:
VCLXTimeField();
~VCLXTimeField();
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxaccessiblecomponent.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxaccessiblecomponent.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxaccessiblecomponent.cxx Wed Dec 18 13:27:09 2013
@@ -37,10 +37,8 @@
#include <toolkit/awt/vclxfont.hxx>
#include <vcl/dialog.hxx>
#include <vcl/window.hxx>
-//IAccessibility2 Implementation 2009-----
//Solution:Need methods in Edit.
#include <vcl/edit.hxx>
-//-----IAccessibility2 Implementation 2009
#include <tools/debug.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
@@ -445,9 +443,7 @@ void VCLXAccessibleComponent::FillAccess
Window* pWindow = GetWindow();
if ( pWindow )
{
-//IAccessibility2 Implementation 2009-----
Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
-//-----IAccessibility2 Implementation 2009
if ( pLabeledBy && pLabeledBy != pWindow )
{
uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -462,7 +458,6 @@ void VCLXAccessibleComponent::FillAccess
aSequence[0] = pLabelFor->GetAccessible();
rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) );
}
-//IAccessibility2 Implementation 2009-----
Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
if ( pMemberOf && pMemberOf != pWindow )
{
@@ -475,7 +470,6 @@ void VCLXAccessibleComponent::FillAccess
{
rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aFlowToSequence ) );
}
-//-----IAccessibility2 Implementation 2009
}
}
@@ -524,19 +518,16 @@ void VCLXAccessibleComponent::FillAccess
if ( pWindow->GetStyle() & WB_SIZEABLE )
rStateSet.AddState( accessibility::AccessibleStateType::RESIZABLE );
-//IAccessibility2 Implementation 2009-----
// 6. frame doesn't have MOVABLE state
// 10. for password text, where is the sensitive state?
if( ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||getAccessibleRole() == accessibility::AccessibleRole::DIALOG )&& pWindow->GetStyle() & WB_MOVEABLE )
rStateSet.AddState( accessibility::AccessibleStateType::MOVEABLE );
-//-----IAccessibility2 Implementation 2009
if( pWindow->IsDialog() )
{
Dialog *pDlg = static_cast< Dialog* >( pWindow );
if( pDlg->IsInExecute() )
rStateSet.AddState( accessibility::AccessibleStateType::MODAL );
}
-//IAccessibility2 Implementation 2009-----
//Solution:If a combobox or list's edit child isn't read-only,EDITABLE state
// should be set.
if( pWindow && pWindow->GetType() == WINDOW_COMBOBOX )
@@ -567,7 +558,6 @@ void VCLXAccessibleComponent::FillAccess
}
pChild = pChild->GetWindow( WINDOW_NEXT );
}
-//-----IAccessibility2 Implementation 2009
}
else
{
@@ -903,11 +893,9 @@ sal_Int32 SAL_CALL VCLXAccessibleCompone
else
aFont = pWindow->GetFont();
nColor = aFont.GetColor().GetColor();
-//IAccessibility2 Implementation 2009-----
// COL_AUTO is not very meaningful for AT
if ( nColor == (sal_Int32)COL_AUTO)
nColor = pWindow->GetTextColor().GetColor();
-//-----IAccessibility2 Implementation 2009
}
}
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxsystemdependentwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxsystemdependentwindow.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxsystemdependentwindow.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxsystemdependentwindow.cxx Wed Dec 18 13:27:09 2013
@@ -100,7 +100,7 @@ IMPL_XTYPEPROVIDER_END
#elif (defined QUARTZ)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
{
- aRet <<= (sal_IntPtr)pSysData->pView;
+ aRet <<= (sal_IntPtr)pSysData->mpNSView;
}
#elif (defined UNX)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtoolkit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtoolkit.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtoolkit.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtoolkit.cxx Wed Dec 18 13:27:09 2013
@@ -632,11 +632,9 @@ void SAL_CALL VCLXToolkit::disposing()
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createWindow( const ::com::sun::star::awt::WindowDescriptor& rDescriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
CEnableAccessInterface e;
#endif
-//-----IAccessibility2 Implementation 2009
return ImplCreateWindow( rDescriptor, WinBits(0) );
}
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtopwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtopwindow.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtopwindow.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxtopwindow.cxx Wed Dec 18 13:27:09 2013
@@ -113,7 +113,7 @@ Sequence< Type > VCLXTopWindow_Base::get
#elif (defined QUARTZ)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
{
- aRet <<= (sal_IntPtr)pSysData->pView;
+ aRet <<= (sal_IntPtr)pSysData->mpNSView;
}
#elif (defined UNX)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxwindows.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxwindows.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxwindows.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/awt/vclxwindows.cxx Wed Dec 18 13:27:09 2013
@@ -4505,7 +4505,6 @@ VCLXDateField::~VCLXDateField()
{
}
-//IAccessibility2 Implementation 2009-----
//change the window type here to match the role
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext()
{
@@ -4516,7 +4515,6 @@ VCLXDateField::~VCLXDateField()
}
return getAccessibleFactory().createAccessibleContext( this );
}
-//-----IAccessibility2 Implementation 2009
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -4859,7 +4857,6 @@ VCLXTimeField::VCLXTimeField()
VCLXTimeField::~VCLXTimeField()
{
}
-//IAccessibility2 Implementation 2009-----
//change the window type here to match the role
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext()
{
@@ -4870,7 +4867,6 @@ VCLXTimeField::~VCLXTimeField()
}
return getAccessibleFactory().createAccessibleContext( this );
}
-//-----IAccessibility2 Implementation 2009
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/helper/property.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/helper/property.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/helper/property.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/helper/property.cxx Wed Dec 18 13:27:09 2013
@@ -78,9 +78,9 @@ struct ImplPropertyInfo
bDependsOnOthers = sal_False;
}
- ImplPropertyInfo( const sal_Unicode* pName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
+ ImplPropertyInfo( const rtl::OUString& rName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
sal_Int16 nAttrs, sal_Bool bDepends = sal_False )
- : aName( pName )
+ : aName( rName )
{
nPropId = nId;
aType = rType;
Modified: openoffice/branches/ooxml-osba/main/toolkit/source/layout/vcl/wrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/toolkit/source/layout/vcl/wrapper.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/toolkit/source/layout/vcl/wrapper.cxx (original)
+++ openoffice/branches/ooxml-osba/main/toolkit/source/layout/vcl/wrapper.cxx Wed Dec 18 13:27:09 2013
@@ -152,7 +152,7 @@ PeerHandle Context::GetPeerHandle( const
if ( nId != 0 )
{
rtl::OString aStr = rtl::OString::valueOf( (sal_Int32) nId );
- xHandle = GetPeerHandle( aStr, 0 );
+ xHandle = GetPeerHandle( aStr.getStr(), 0 );
}
return xHandle;
}
@@ -955,7 +955,7 @@ void MessageBox::init (OUString const& m
else
noButton.Hide ();
}
- if (help_id)
+ if( !help_id.isEmpty())
SetHelpId (help_id);
else
helpButton.Hide ();
Modified: openoffice/branches/ooxml-osba/main/tools/inc/tools/debug.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/tools/inc/tools/debug.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/tools/inc/tools/debug.hxx (original)
+++ openoffice/branches/ooxml-osba/main/tools/inc/tools/debug.hxx Wed Dec 18 13:27:09 2013
@@ -345,23 +345,11 @@ TOOLS_DLLPUBLIC void DbgOutTypef( sal_uI
TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... );
TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... );
-inline void DbgTrace( const sal_Char* pMsg,
- const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
-{
- DbgOut( pMsg, DBG_OUT_TRACE, pFile, nLine );
-}
+#define DbgTrace( msg) do{ DbgOut( msg, DBG_OUT_TRACE, __FILE__, __LINE__ ); } while(0)
-inline void DbgWarning( const sal_Char* pMsg,
- const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
-{
- DbgOut( pMsg, DBG_OUT_WARNING, pFile, nLine );
-}
+#define DbgWarning( msg) do{ DbgOut( msg, DBG_OUT_WARNING, __FILE__, __LINE__ ); } while(0)
-inline void DbgError( const sal_Char* pMsg,
- const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
-{
- DbgOut( pMsg, DBG_OUT_ERROR, pFile, nLine );
-}
+#define DbgError( msg) do{ DbgOut( msg, DBG_OUT_ERROR, __FILE__, __LINE__ ); } while(0)
// --- Dbg-Test-Functions ---
@@ -473,8 +461,7 @@ do
{ \
if ( !( sCon ) ) \
{ \
- DbgWarning( aWarning, __FILE__, \
- __LINE__ ); \
+ DbgWarning( aWarning); \
} \
} \
} while(0)
@@ -486,8 +473,7 @@ do
{ \
if ( !( sCon ) ) \
{ \
- DbgError( aError, \
- __FILE__, __LINE__ ); \
+ DbgError( aError); \
} \
} \
} while(0)
@@ -498,8 +484,7 @@ do
{ \
if ( !( sCon ) ) \
{ \
- DbgError( aError, \
- __FILE__, __LINE__ ); \
+ DbgError( aError); \
} \
} while(0)
#else
@@ -561,7 +546,7 @@ do
do \
{ \
if ( DbgIsTraceOut() ) \
- DbgTrace( aTrace, __FILE__, __LINE__ ); \
+ DbgTrace( aTrace ); \
} while(0)
#define DBG_WARNING( aWarning ) \
@@ -619,7 +604,7 @@ do
do \
{ \
if ( DbgIsWarningOut() ) \
- DbgWarning( aWarning, __FILE__, __LINE__ ); \
+ DbgWarning( aWarning ); \
} while(0)
#define DBG_ERROR( aError ) \
@@ -677,7 +662,7 @@ do
do \
{ \
if ( DbgIsErrorOut() ) \
- DbgError( aError, __FILE__, __LINE__ ); \
+ DbgError( aError ); \
} while(0)
#define DBG_TESTSOLARMUTEX() \
Modified: openoffice/branches/ooxml-osba/main/tools/inc/tools/prex.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/tools/inc/tools/prex.h?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/tools/inc/tools/prex.h (original)
+++ openoffice/branches/ooxml-osba/main/tools/inc/tools/prex.h Wed Dec 18 13:27:09 2013
@@ -39,20 +39,13 @@
extern "C" {
#endif
-#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really check for xfree86 or for X11R6.1 and higher
-#define __XKeyboardExtension__ 1
-#else
-#define __XKeyboardExtension__ 0
-#endif
-
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/StringDefs.h>
#include <X11/extensions/Xrender.h>
-#if __XKeyboardExtension__
#include <X11/XKBlib.h>
-#endif
+
typedef unsigned long Pixel;
#undef DestroyAll
Modified: openoffice/branches/ooxml-osba/main/tools/source/fsys/tempfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/tools/source/fsys/tempfile.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/tools/source/fsys/tempfile.cxx (original)
+++ openoffice/branches/ooxml-osba/main/tools/source/fsys/tempfile.cxx Wed Dec 18 13:27:09 2013
@@ -80,7 +80,7 @@ String ConstructTempDir_Impl( const Stri
if ( aRet[i-1] == '/' )
i--;
- if ( DirectoryItem::get( ::rtl::OUString( aRet, i ), aItem ) == FileBase::E_None )
+ if ( DirectoryItem::get( ::rtl::OUString( aRet.getStr(), i ), aItem ) == FileBase::E_None )
aName = aRet;
}
}
Modified: openoffice/branches/ooxml-osba/main/tools/source/generic/color.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/tools/source/generic/color.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/tools/source/generic/color.cxx (original)
+++ openoffice/branches/ooxml-osba/main/tools/source/generic/color.cxx Wed Dec 18 13:27:09 2013
@@ -143,14 +143,14 @@ void Color::Invert()
sal_Bool Color::IsDark() const
{
- return GetLuminance() <= 38;
+ return GetLuminance() <= 55;
}
// -----------------------------------------------------------------------
sal_Bool Color::IsBright() const
{
- return GetLuminance() >= 245;
+ return GetLuminance() >= 245;
}
// -----------------------------------------------------------------------
@@ -259,53 +259,53 @@ ColorData Color::HSBtoRGB( sal_uInt16 nH
// -----------------------------------------------------------------------
-// CMYK values from 0 to 1
-ColorData Color::CMYKtoRGB( double fCyan, double fMagenta, double fYellow, double fKey )
-{
- fCyan = (fCyan * ( 1.0 - fKey )) + fKey;
- fMagenta = (fMagenta * ( 1.0 - fKey )) + fKey;
- fYellow = (fYellow * ( 1.0 - fKey )) + fKey;
-
- sal_uInt8 nRed = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fCyan ) * 255.0, 255.0), 0.0 ) );
- sal_uInt8 nGreen = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fMagenta ) * 255.0, 255.0), 0.0 ) );
- sal_uInt8 nBlue = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fYellow ) * 255.0, 255.0), 0.0 ) );
-
- return RGB_COLORDATA( nRed, nGreen, nBlue );
-}
-
-// -----------------------------------------------------------------------
-
-// RGB values from 0 to 255
-// CMY results from 0 to 1
-void Color::RGBtoCMYK( double& fCyan, double& fMagenta, double& fYellow, double& fKey )
-{
- fCyan = 1 - ( GetRed() / 255.0 );
- fMagenta = 1 - ( GetGreen() / 255.0 );
- fYellow = 1 - ( GetBlue() / 255.0 );
-
- //CMYK and CMY values from 0 to 1
- fKey = 1.0;
- if( fCyan < fKey ) fKey = fCyan;
- if( fMagenta < fKey ) fKey = fMagenta;
- if( fYellow < fKey ) fKey = fYellow;
-
- if ( fKey == 1.0 )
- {
- //Black
- fCyan = 0.0;
- fMagenta = 0.0;
- fYellow = 0.0;
- }
- else
- {
- fCyan = ( fCyan - fKey ) / ( 1.0 - fKey );
- fMagenta = ( fMagenta - fKey ) / ( 1.0 - fKey );
- fYellow = ( fYellow - fKey ) / ( 1.0 - fKey );
- }
-}
-
-// -----------------------------------------------------------------------
-
+// CMYK values from 0 to 1
+ColorData Color::CMYKtoRGB( double fCyan, double fMagenta, double fYellow, double fKey )
+{
+ fCyan = (fCyan * ( 1.0 - fKey )) + fKey;
+ fMagenta = (fMagenta * ( 1.0 - fKey )) + fKey;
+ fYellow = (fYellow * ( 1.0 - fKey )) + fKey;
+
+ sal_uInt8 nRed = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fCyan ) * 255.0, 255.0), 0.0 ) );
+ sal_uInt8 nGreen = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fMagenta ) * 255.0, 255.0), 0.0 ) );
+ sal_uInt8 nBlue = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fYellow ) * 255.0, 255.0), 0.0 ) );
+
+ return RGB_COLORDATA( nRed, nGreen, nBlue );
+}
+
+// -----------------------------------------------------------------------
+
+// RGB values from 0 to 255
+// CMY results from 0 to 1
+void Color::RGBtoCMYK( double& fCyan, double& fMagenta, double& fYellow, double& fKey )
+{
+ fCyan = 1 - ( GetRed() / 255.0 );
+ fMagenta = 1 - ( GetGreen() / 255.0 );
+ fYellow = 1 - ( GetBlue() / 255.0 );
+
+ //CMYK and CMY values from 0 to 1
+ fKey = 1.0;
+ if( fCyan < fKey ) fKey = fCyan;
+ if( fMagenta < fKey ) fKey = fMagenta;
+ if( fYellow < fKey ) fKey = fYellow;
+
+ if ( fKey == 1.0 )
+ {
+ //Black
+ fCyan = 0.0;
+ fMagenta = 0.0;
+ fYellow = 0.0;
+ }
+ else
+ {
+ fCyan = ( fCyan - fKey ) / ( 1.0 - fKey );
+ fMagenta = ( fMagenta - fKey ) / ( 1.0 - fKey );
+ fYellow = ( fYellow - fKey ) / ( 1.0 - fKey );
+ }
+}
+
+// -----------------------------------------------------------------------
+
SvStream& Color::Read( SvStream& rIStm, sal_Bool bNewFormat )
{
if ( bNewFormat )
Modified: openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_content.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_content.cxx (original)
+++ openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_content.cxx Wed Dec 18 13:27:09 2013
@@ -98,7 +98,7 @@ static char *
OUStringToGnome( const rtl::OUString &str )
{
rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 );
- return g_strdup( (const sal_Char *) aTempStr );
+ return g_strdup( aTempStr.getStr() );
}
static rtl::OUString
@@ -403,7 +403,7 @@ uno::Any SAL_CALL Content::execute(
aCommand.Argument >>= bDeletePhysical;
::rtl::OString aURI = getOURI();
- GnomeVFSResult result = gnome_vfs_unlink ((const sal_Char *) aURI);
+ GnomeVFSResult result = gnome_vfs_unlink( aURI.getStr());
if (result != GNOME_VFS_OK)
cancelCommandExecution( result, xEnv, sal_True );
@@ -554,8 +554,7 @@ rtl::OUString Content::getParentURL()
#ifdef DEBUG
g_warning ("getParentURL '%s' -> '%s'",
- getURI(), (const sal_Char *) rtl::OUStringToOString
- ( aParentURL, RTL_TEXTENCODING_UTF8 ) );
+ getURI(), rtl::OUStringToOString( aParentURL, RTL_TEXTENCODING_UTF8).getStr() );
#endif
return aParentURL;
@@ -633,8 +632,7 @@ uno::Reference< sdbc::XRow > Content::ge
GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
::rtl::OString aURI = getOURI();
- gnome_vfs_get_file_info
- ( (const sal_Char *)aURI, fileInfo,
+ gnome_vfs_get_file_info( aURI.getStr(), fileInfo,
GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS );
if (fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) {
@@ -735,7 +733,7 @@ Content::doSetFileInfo( const GnomeVFSFi
// The simple approach:
if( setMask != GNOME_VFS_SET_FILE_INFO_NONE )
result = gnome_vfs_set_file_info // missed a const in the API there
- ( (const sal_Char *) aURI, (GnomeVFSFileInfo *)newInfo, setMask );
+ ( aURI.getStr(), (GnomeVFSFileInfo *)newInfo, setMask );
if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED &&
( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) ) {
@@ -746,7 +744,7 @@ Content::doSetFileInfo( const GnomeVFSFi
char *newURI = OUStringToGnome( makeNewURL( newInfo->name ) );
- result = gnome_vfs_move ((const sal_Char *)aURI, newURI, FALSE);
+ result = gnome_vfs_move( aURI.getStr(), newURI, FALSE);
g_free (newURI);
}
@@ -958,7 +956,7 @@ void Content::insert(
#ifdef DEBUG
g_warning ("Make directory");
#endif
- result = gnome_vfs_make_directory( (const sal_Char *) aURI, perm );
+ result = gnome_vfs_make_directory( aURI.getStr(), perm );
if( result != GNOME_VFS_OK )
cancelCommandExecution( result, xEnv, sal_True );
@@ -982,7 +980,7 @@ void Content::insert(
result = GNOME_VFS_OK;
if ( bReplaceExisting ) {
Authentication aAuth( xEnv );
- result = gnome_vfs_open( &handle, (const sal_Char *)aURI,
+ result = gnome_vfs_open( &handle, aURI.getStr(),
GNOME_VFS_OPEN_WRITE );
}
@@ -994,7 +992,7 @@ void Content::insert(
( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) );
result = gnome_vfs_create
- ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_WRITE, TRUE, perm );
+ ( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE, TRUE, perm );
}
if( result != GNOME_VFS_OK )
@@ -1134,7 +1132,7 @@ Content::getInfo( const uno::Reference<
::rtl::OString aURI = getOURI();
Authentication aAuth( xEnv );
result = gnome_vfs_get_file_info
- ( (const sal_Char *)aURI, &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
+ ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
if (result != GNOME_VFS_OK)
gnome_vfs_file_info_clear( &m_info );
} else
@@ -1453,8 +1451,7 @@ Content::createTempStream(
if ( !xTempOut.is() )
cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
- result = gnome_vfs_open
- ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_READ );
+ result = gnome_vfs_open( &handle, aURI.getStr(), GNOME_VFS_OPEN_READ );
if (result != GNOME_VFS_OK)
cancelCommandExecution( result, xEnv );
@@ -1482,8 +1479,7 @@ Content::createInputStream(
if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) )
return createTempStream( xEnv );
- result = gnome_vfs_open
- ( &handle, (const sal_Char *)aURI,
+ result = gnome_vfs_open( &handle, aURI.getStr(),
(GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) );
if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE ||
Modified: openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_provider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_provider.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_provider.cxx (original)
+++ openoffice/branches/ooxml-osba/main/ucb/source/ucp/gvfs/gvfs_provider.cxx Wed Dec 18 13:27:09 2013
@@ -108,8 +108,7 @@ ContentProvider::queryContent(
{
#ifdef DEBUG
g_warning ("QueryContent: '%s'",
- (const sal_Char *)rtl::OUStringToOString
- (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
+ rtl::OUStringToOString( Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
#endif
osl::MutexGuard aGuard( m_aMutex );
Modified: openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/DAVProperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/DAVProperties.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/DAVProperties.cxx (original)
+++ openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/DAVProperties.cxx Wed Dec 18 13:27:09 2013
@@ -66,7 +66,7 @@ void DAVProperties::createSerfPropName(
rName.name
= strdup( rtl::OUStringToOString(
rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ),
- RTL_TEXTENCODING_UTF8 ) );
+ RTL_TEXTENCODING_UTF8 ).getStr() );
}
else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(
"http://apache.org/dav/props/" ) ) == 0 )
@@ -77,7 +77,7 @@ void DAVProperties::createSerfPropName(
rFullName.copy(
RTL_CONSTASCII_LENGTH(
"http://apache.org/dav/props/" ) ),
- RTL_TEXTENCODING_UTF8 ) );
+ RTL_TEXTENCODING_UTF8 ).getStr() );
}
else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(
"http://ucb.openoffice.org/dav/props/" ) ) == 0 )
@@ -88,7 +88,7 @@ void DAVProperties::createSerfPropName(
rFullName.copy(
RTL_CONSTASCII_LENGTH(
"http://ucb.openoffice.org/dav/props/" ) ),
- RTL_TEXTENCODING_UTF8 ) );
+ RTL_TEXTENCODING_UTF8 ).getStr() );
}
else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(
"<prop:" ) ) == 0 )
@@ -102,11 +102,11 @@ void DAVProperties::createSerfPropName(
sal_Int32 nStart = RTL_CONSTASCII_LENGTH( "<prop:" );
sal_Int32 nLen = aFullName.indexOf( ' ' ) - nStart;
- rName.name = strdup( aFullName.copy( nStart, nLen ) );
+ rName.name = strdup( aFullName.copy( nStart, nLen ).getStr() );
nStart = aFullName.indexOf( '=', nStart + nLen ) + 2; // after ="
nLen = aFullName.getLength() - RTL_CONSTASCII_LENGTH( "\">" ) - nStart;
- rName.nspace = strdup( aFullName.copy( nStart, nLen ) );
+ rName.nspace = strdup( aFullName.copy( nStart, nLen ).getStr() );
}
else
{
@@ -114,7 +114,7 @@ void DAVProperties::createSerfPropName(
rName.nspace = "http://ucb.openoffice.org/dav/props/";
rName.name
= strdup( rtl::OUStringToOString( rFullName,
- RTL_TEXTENCODING_UTF8 ) );
+ RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
Modified: openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx (original)
+++ openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx Wed Dec 18 13:27:09 2013
@@ -55,7 +55,7 @@ SerfRequestProcessor::SerfRequestProcess
, mbHandleSerfResponseCalled( false )
{
mPathStr = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() );
}
SerfRequestProcessor::~SerfRequestProcessor()
@@ -214,9 +214,9 @@ bool SerfRequestProcessor::processPost(
apr_status_t& outSerfStatus )
{
mContentType = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() );
mReferer = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createPostReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inData,
@@ -238,9 +238,9 @@ bool SerfRequestProcessor::processPost(
apr_status_t& outSerfStatus )
{
mContentType = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() );
mReferer = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createPostReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inData,
@@ -279,7 +279,7 @@ bool SerfRequestProcessor::processCopy(
apr_status_t& outSerfStatus )
{
mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createCopyReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
mDestPathStr,
@@ -295,7 +295,7 @@ bool SerfRequestProcessor::processMove(
apr_status_t& outSerfStatus )
{
mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(),
- rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() );
mpProcImpl = createMoveReqProcImpl( mPathStr,
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
mDestPathStr,
Modified: openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfSession.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfSession.cxx (original)
+++ openoffice/branches/ooxml-osba/main/ucb/source/ucp/webdav/SerfSession.cxx Wed Dec 18 13:27:09 2013
@@ -163,7 +163,7 @@ void SerfSession::Init()
{
apr_sockaddr_t *proxy_address = NULL;
status = apr_sockaddr_info_get( &proxy_address,
- rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ),
+ rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(),
APR_UNSPEC,
static_cast<apr_port_t>(m_nProxyPort),
0, getAprPool() );
@@ -339,8 +339,8 @@ apr_status_t SerfSession::provideSerfCre
if ( theRetVal == 0 )
{
- *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) );
- *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) );
+ *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() );
}
return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS;
Modified: openoffice/branches/ooxml-osba/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx (original)
+++ openoffice/branches/ooxml-osba/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx Wed Dec 18 13:27:09 2013
@@ -32,6 +32,8 @@
#include <hash_set>
#include <map>
+inline std::ostream& operator<<( std::ostream& s, const rtl::OString r) { return (s << r.getStr()); }
+
namespace skeletonmaker {
typedef ::std::map< ::rtl::OString, ::std::vector< ::rtl::OString >,
Modified: openoffice/branches/ooxml-osba/main/unotools/source/config/cmdoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/unotools/source/config/cmdoptions.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/unotools/source/config/cmdoptions.cxx (original)
+++ openoffice/branches/ooxml-osba/main/unotools/source/config/cmdoptions.cxx Wed Dec 18 13:27:09 2013
@@ -102,7 +102,7 @@ class SvtCmdOptions
void SetContainerSize( sal_Int32 nSize )
{
- m_aCommandHashMap.resize( nSize );
+ m_aCommandHashMap.rehash( nSize );
}
sal_Bool Lookup( const OUString& aCmd ) const
Modified: openoffice/branches/ooxml-osba/main/unotools/source/ucbhelper/tempfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/unotools/source/ucbhelper/tempfile.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/unotools/source/ucbhelper/tempfile.cxx (original)
+++ openoffice/branches/ooxml-osba/main/unotools/source/ucbhelper/tempfile.cxx Wed Dec 18 13:27:09 2013
@@ -156,7 +156,7 @@ String ConstructTempDir_Impl( const Stri
if ( aRet[i-1] == '/' )
i--;
- if ( DirectoryItem::get( ::rtl::OUString( aRet, i ), aItem ) == FileBase::E_None )
+ if ( DirectoryItem::get( ::rtl::OUString( aRet.getStr(), i ), aItem ) == FileBase::E_None )
aName = aRet;
}
}
Modified: openoffice/branches/ooxml-osba/main/unoxml/source/dom/characterdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/unoxml/source/dom/characterdata.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/unoxml/source/dom/characterdata.cxx (original)
+++ openoffice/branches/ooxml-osba/main/unoxml/source/dom/characterdata.cxx Wed Dec 18 13:27:09 2013
@@ -89,7 +89,7 @@ namespace DOM
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
- OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+ OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0 || count < 0) {
DOMException e;
e.Code = DOMExceptionType_INDEX_SIZE_ERR;
@@ -160,7 +160,7 @@ namespace DOM
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
- OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+ OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0) {
DOMException e;
e.Code = DOMExceptionType_INDEX_SIZE_ERR;
@@ -195,7 +195,7 @@ namespace DOM
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
- OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+ OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0 || count < 0){
DOMException e;
e.Code = DOMExceptionType_INDEX_SIZE_ERR;
@@ -250,7 +250,7 @@ namespace DOM
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
- OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+ OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0 || count < 0) {
DOMException e;
e.Code = DOMExceptionType_INDEX_SIZE_ERR;
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/app/vclnsapp.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/app/vclnsapp.mm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/app/vclnsapp.mm (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/app/vclnsapp.mm Wed Dec 18 13:27:09 2013
@@ -79,7 +79,7 @@
if( nModMask == NSCommandKeyMask
&& [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] )
{
- [pFrame->getWindow() windowShouldClose: nil];
+ [pFrame->getNSWindow() windowShouldClose: nil];
return;
}
}
@@ -89,9 +89,9 @@
*/
if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] )
{
- if ( nModMask == NSCommandKeyMask && ([pFrame->getWindow() styleMask] & NSMiniaturizableWindowMask) )
+ if ( nModMask == NSCommandKeyMask && ([pFrame->getNSWindow() styleMask] & NSMiniaturizableWindowMask) )
{
- [pFrame->getWindow() performMiniaturize: nil];
+ [pFrame->getNSWindow() performMiniaturize: nil];
return;
}
@@ -220,7 +220,7 @@
if( (*it)->mpDockMenuEntry != NULL &&
(*it)->mbShown )
{
- [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+ [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
return;
}
}
@@ -232,7 +232,7 @@
if( (*it)->mpDockMenuEntry != NULL &&
(*it)->mbShown )
{
- [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+ [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
return;
}
++it;
@@ -260,7 +260,7 @@
if( (*it)->mpDockMenuEntry != NULL &&
(*it)->mbShown )
{
- [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+ [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
return;
}
}
@@ -272,7 +272,7 @@
if( (*it)->mpDockMenuEntry != NULL &&
(*it)->mbShown )
{
- [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+ [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
return;
}
++it;
@@ -466,9 +466,10 @@
for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
it != pSalData->maPresentationFrames.end(); ++it )
{
- [(*it)->mpWindow setLevel: NSPopUpMenuWindowLevel];
- if( [(*it)->mpWindow isVisible] )
- [(*it)->mpWindow orderFront: NSApp];
+ NSWindow* pNSWindow = (*it)->getNSWindow();
+ [pNSWindow setLevel: NSPopUpMenuWindowLevel];
+ if( [pNSWindow isVisible] )
+ [pNSWindow orderFront: NSApp];
}
}
@@ -492,7 +493,7 @@
for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
it != pSalData->maPresentationFrames.end(); ++it )
{
- [(*it)->mpWindow setLevel: NSNormalWindowLevel];
+ [(*it)->getNSWindow() setLevel: NSNormalWindowLevel];
}
}
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx Wed Dec 18 13:27:09 2013
@@ -64,7 +64,7 @@ namespace // private
typedef vector<sal_Unicode> UnicodeBuffer;
- OUString NSStringToOUString(NSString* cfString)
+ OUString NSStringToOUString( const NSString* cfString)
{
BOOST_ASSERT(cfString && "Invalid parameter");
@@ -113,7 +113,7 @@ namespace // private
struct FlavorMap
{
- NSString* SystemFlavor;
+ const NSString* SystemFlavor;
const char* OOoFlavor;
const char* HumanPresentableName;
Type DataType;
@@ -121,7 +121,7 @@ namespace // private
/* At the moment it appears as if only MS Office pastes "public.html" to the clipboard.
*/
- FlavorMap flavorMap[] =
+ static const FlavorMap flavorMap[] =
{
{ NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", CPPUTYPE_OUSTRING },
{ NSRTFPboardType, "text/richtext", "Rich Text Format", CPPUTYPE_SEQINT8 },
@@ -521,13 +521,13 @@ DataFlavorMapper::~DataFlavorMapper()
}
}
-DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor) const
+DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const
{
DataFlavor oOOFlavor;
for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++)
{
- if ([systemDataFlavor caseInsensitiveCompare: flavorMap[i].SystemFlavor] == NSOrderedSame)
+ if ([systemDataFlavor caseInsensitiveCompare:const_cast<NSString*>(flavorMap[i].SystemFlavor)] == NSOrderedSame)
{
oOOFlavor.MimeType = OUString::createFromAscii( flavorMap[i].OOoFlavor);
oOOFlavor.HumanPresentableName = OUString::createFromAscii( flavorMap[i].HumanPresentableName);
@@ -549,9 +549,10 @@ DataFlavor DataFlavorMapper::systemToOpe
return oOOFlavor;
}
-NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor, bool& rbInternal) const
+const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor& oOOFlavor, bool& rbInternal) const
{
- NSString* sysFlavor = NULL;
+ const NSString* sysFlavor = NULL;
+ rbInternal = false;
rbInternal = false;
for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
@@ -583,7 +584,7 @@ NSString* DataFlavorMapper::openOfficeIm
return sysFlavor;
}
-DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Reference<XTransferable> rTransferable) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* systemFlavor, Reference<XTransferable> rTransferable) const
{
DataProviderPtr_t dp;
@@ -639,12 +640,12 @@ DataProviderPtr_t DataFlavorMapper::getD
return dp;
}
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* /*systemFlavor*/, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* /*systemFlavor*/, NSArray* systemData) const
{
return DataProviderPtr_t(new FileListDataProvider(systemData));
}
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor, NSData* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider( const NSString* systemFlavor, NSData* systemData) const
{
DataProviderPtr_t dp;
@@ -708,7 +709,7 @@ NSArray* DataFlavorMapper::flavorSequenc
}
else
{
- NSString* str = openOfficeToSystemFlavor(flavors[i], bNeedDummyInternalFlavor);
+ const NSString* str = openOfficeToSystemFlavor(flavors[i], bNeedDummyInternalFlavor);
if (str != NULL)
{
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx Wed Dec 18 13:27:09 2013
@@ -78,14 +78,14 @@ public:
mapping from a system data flavor to a OpenOffice data
flavor.
*/
- com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor(NSString* systemDataFlavor) const;
+ com::sun::star::datatransfer::DataFlavor systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const;
/* Map an OpenOffice data flavor to a system data flavor.
If there is no suiteable mapping available NULL will
be returned.
*/
- NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const;
+ const NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) const;
/* Select the best available image data type
If there is no suiteable mapping available NULL will
@@ -96,19 +96,19 @@ public:
/* Get a data provider which is able to provide the data 'rTransferable' offers in a format that can
be put on to the system clipboard.
*/
- DataProviderPtr_t getDataProvider(NSString* systemFlavor,
+ DataProviderPtr_t getDataProvider( const NSString* systemFlavor,
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable > rTransferable) const;
/* Get a data provider which is able to provide 'systemData' in the OOo expected format.
*/
- DataProviderPtr_t getDataProvider(const NSString* systemFlavor, NSArray* systemData) const;
+ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSArray* systemData) const;
/* Get a data provider which is able to provide 'systemData' in the OOo expected format.
*/
- DataProviderPtr_t getDataProvider(const NSString* systemFlavor, NSData* systemData) const;
+ DataProviderPtr_t getDataProvider( const NSString* systemFlavor, NSData* systemData) const;
/* Translate a sequence of DataFlavors into a NSArray of system types.
@@ -125,7 +125,7 @@ public:
/* Returns an NSArray containing all pasteboard types supported by OOo
*/
- NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const;
+ NSArray* getAllSupportedPboardTypes() const;
private:
/* Determines if the provided Mime content type is valid.
@@ -140,4 +140,5 @@ private:
typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t;
-#endif
+#endif
+
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx Wed Dec 18 13:27:09 2013
@@ -57,7 +57,7 @@ using namespace comphelper;
return self;
}
--(void)pasteboard:(NSPasteboard*)sender provideDataForType:(NSString*)type
+-(void)pasteboard:(NSPasteboard*)sender provideDataForType:(const NSString*)type
{
if( pAquaClipboard )
pAquaClipboard->provideDataForType(sender, type);
@@ -316,7 +316,7 @@ void AquaClipboard::fireLostClipboardOwn
}
-void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
+void AquaClipboard::provideDataForType(NSPasteboard* sender, const NSString* type)
{
if( mXClipboardContent.is() )
{
@@ -326,7 +326,7 @@ void AquaClipboard::provideDataForType(N
if (dp.get() != NULL)
{
pBoardData = (NSData*)dp->getSystemData();
- [sender setData: pBoardData forType: type];
+ [sender setData: pBoardData forType:const_cast<NSString*>(type)];
}
}
}
@@ -347,8 +347,8 @@ void SAL_CALL AquaClipboard::flushClipbo
for (sal_uInt32 i = 0; i < nFlavors; i++)
{
- NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i], bInternal);
-
+ const NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i], bInternal);
+
if (sysType != NULL)
{
provideDataForType(mPasteboard, sysType);
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/dtrans/aqua_clipboard.hxx Wed Dec 18 13:27:09 2013
@@ -58,7 +58,7 @@ class AquaClipboard;
- (EventListener*)initWithAquaClipboard: (AquaClipboard*) pcb;
// Promiss resolver function
-- (void)pasteboard:(NSPasteboard*)sender provideDataForType:(NSString *)type;
+- (void)pasteboard:(NSPasteboard*)sender provideDataForType:(const NSString *)type;
-(void)applicationDidBecomeActive:(NSNotification*)aNotification;
@@ -151,7 +151,7 @@ public:
void pasteboardChangedOwner();
- void provideDataForType(NSPasteboard* sender, NSString* type);
+ void provideDataForType(NSPasteboard* sender, const NSString* type);
void applicationDidBecomeActive(NSNotification* aNotification);
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm Wed Dec 18 13:27:09 2013
@@ -145,30 +145,14 @@ class ControllerProperties
mnLastPageCount = nPages;
if( mpState->bNeedRestart )
{
- #if 0
// Warning: bad hack ahead
// Apple does not give us a chance of changing the page count,
// and they don't let us cancel the dialog either
// hack: send a cancel message to the window displaying our views.
// this is ugly.
- for( std::vector< NSObject* >::iterator it = maViews.begin(); it != maViews.end(); ++it )
- {
- if( [*it isKindOfClass: [NSView class]] )
- {
- NSView* pView = (NSView*)*it;
- NSWindow* pWindow = [pView window];
- if( pWindow )
- {
- [pWindow cancelOperation: nil];
- break;
- }
- }
- }
- #else
- NSWindow* pWindow = [NSApp modalWindow];
- if( pWindow )
- [pWindow cancelOperation: nil];
- #endif
+ NSWindow* pNSWindow = [NSApp modalWindow];
+ if( pNSWindow )
+ [pNSWindow cancelOperation: nil];
[[mpOp printInfo] setJobDisposition: NSPrintCancelJob];
}
else
@@ -597,7 +581,7 @@ struct ColumnItem
}
};
-static void adjustViewAndChildren( NSView* pView, NSSize& rMaxSize,
+static void adjustViewAndChildren( NSView* pNSView, NSSize& rMaxSize,
std::vector< ColumnItem >& rLeftColumn,
std::vector< ColumnItem >& rRightColumn
)
@@ -657,7 +641,7 @@ static void adjustViewAndChildren( NSVie
}
}
- NSArray* pSubViews = [pView subviews];
+ NSArray* pSubViews = [pNSView subviews];
unsigned int nViews = [pSubViews count];
NSRect aUnion = { { 0, 0 }, { 0, 0 } };
@@ -680,7 +664,7 @@ static void adjustViewAndChildren( NSVie
// resize the view itself
aUnion.size.height += 10;
aUnion.size.width += 20;
- [pView setFrameSize: aUnion.size];
+ [pNSView setFrameSize: aUnion.size];
if( aUnion.size.width > rMaxSize.width )
rMaxSize.width = aUnion.size.width;
@@ -696,15 +680,15 @@ static void adjustTabViews( NSTabView* p
for( int i = 0; i < nViews; i++ )
{
NSTabViewItem* pItem = (NSTabViewItem*)[pTabbedViews objectAtIndex: i];
- NSView* pView = [pItem view];
- if( pView )
+ NSView* pNSView = [pItem view];
+ if( pNSView )
{
- NSRect aRect = [pView frame];
+ NSRect aRect = [pNSView frame];
double nDiff = aTabSize.height - aRect.size.height;
aRect.size = aTabSize;
- [pView setFrame: aRect];
+ [pNSView setFrame: aRect];
- NSArray* pSubViews = [pView subviews];
+ NSArray* pSubViews = [pNSView subviews];
unsigned int nSubViews = [pSubViews count];
// move everything up
Modified: openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salatslayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salatslayout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salatslayout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/aqua/source/gdi/salatslayout.cxx Wed Dec 18 13:27:09 2013
@@ -480,7 +480,7 @@ void ATSLayout::DrawText( SalGraphics& r
*
* @return : number of glyph details that were provided
**/
-int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIDs, Point& rPos, int& nStart,
+int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& rPos, int& nStart,
sal_Int32* pGlyphAdvances, int* pCharIndexes ) const
{
if( nStart < 0 ) // first glyph requested?
@@ -539,7 +539,7 @@ int ATSLayout::GetNextGlyphs( int nLen,
while( nCount < nLen )
{
++nCount;
- sal_GlyphId nGlyphId = mpGlyphIds[nStart];
+ sal_GlyphId aGlyphId = mpGlyphIds[ nStart];
// check if glyph fallback is needed for this glyph
// TODO: use ATSUDirectGetLayoutDataArrayPtrFromTextLayout(kATSUDirectDataStyleIndex) API instead?
@@ -557,11 +557,11 @@ int ATSLayout::GetNextGlyphs( int nLen,
// register fallback font
const int nLevel = mpFallbackInfo->AddFallback( nFallbackFontID );
// update sal_GlyphId with fallback level
- nGlyphId |= (nLevel << GF_FONTSHIFT);
+ aGlyphId |= (nLevel << GF_FONTSHIFT);
}
// update resulting glyphid array
- *(pGlyphIDs++) = nGlyphId;
+ *(pOutGlyphIds++) = aGlyphId;
// update returned glyph advance array
if( pGlyphAdvances )
@@ -1209,13 +1209,13 @@ void ATSLayout::Simplify( bool /*bIsBase
// get the ImplFontData for a glyph fallback font
// for a glyphid that was returned by ATSLayout::GetNextGlyphs()
-const ImplFontData* ATSLayout::GetFallbackFontData( sal_GlyphId nGlyphId ) const
+const ImplFontData* ATSLayout::GetFallbackFontData( sal_GlyphId aGlyphId ) const
{
// check if any fallback fonts were needed
if( !mpFallbackInfo )
return NULL;
// check if the current glyph needs a fallback font
- int nFallbackLevel = (nGlyphId & GF_FONTMASK) >> GF_FONTSHIFT;
+ int nFallbackLevel = (aGlyphId & GF_FONTMASK) >> GF_FONTSHIFT;
if( !nFallbackLevel )
return NULL;
return mpFallbackInfo->GetFallbackFontData( nFallbackLevel );