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 [13/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/sd/source/ui/view/drviews4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews4.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews4.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews4.cxx Wed Dec 18 13:27:09 2013
@@ -79,9 +79,7 @@
// #97016# IV
#include <svx/svditer.hxx>
-//IAccessibility2 Implementation 2009-----
#include <navigatr.hxx>
-//-----IAccessibility2 Implementation 2009
namespace sd {
#define PIPETTE_RANGE 0
@@ -230,14 +228,12 @@ sal_Bool DrawViewShell::KeyInput (const
else
{
bRet = ViewShell::KeyInput(rKEvt, pWin);
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
if(KEY_TAB == rKEvt.GetKeyCode().GetCode())
{
FreshNavigatrTree();
}
-//-----IAccessibility2 Implementation 2009
}
}
@@ -282,7 +278,6 @@ void DrawViewShell::StartRulerDrag (
mbIsRulerDrag = sal_True;
}
}
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
void DrawViewShell::FreshNavigatrEntry()
@@ -308,7 +303,6 @@ void DrawViewShell::FreshNavigatrTree()
pNavWin->FreshTree( GetDoc() );
}
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* MouseButtonDown event
@@ -335,11 +329,9 @@ void DrawViewShell::MouseButtonDown(cons
{
ViewShell::MouseButtonDown(rMEvt, pWin);
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
FreshNavigatrTree();
-//-----IAccessibility2 Implementation 2009
if ( mbPipette )
( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )->PipetteClicked();
}
@@ -509,11 +501,9 @@ void DrawViewShell::MouseButtonUp(const
}
else
ViewShell::MouseButtonUp(rMEvt, pWin);
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
FreshNavigatrTree();
-//-----IAccessibility2 Implementation 2009
}
}
Modified: openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews5.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews5.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/ui/view/drviews5.cxx Wed Dec 18 13:27:09 2013
@@ -705,7 +705,6 @@ void DrawViewShell::SetActiveTabLayerInd
// Tell the draw view and the tab control of the new active layer.
mpDrawView->SetActiveLayer (pBar->GetPageText (pBar->GetPageId ((sal_uInt16)nIndex)));
pBar->SetCurPageId (pBar->GetPageId ((sal_uInt16)nIndex));
- //IAccessibility2 Implementation 2009-----
SdUnoDrawView* pUnoDrawView = new SdUnoDrawView (
GetViewShellBase().GetDrawController(),
*this,
@@ -713,7 +712,6 @@ void DrawViewShell::SetActiveTabLayerInd
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer();
GetViewShellBase().GetDrawController().fireChangeLayer( &rLayer );
delete pUnoDrawView;
- //-----IAccessibility2 Implementation 2009
}
}
}
Modified: openoffice/branches/ooxml-osba/main/sd/source/ui/view/outlnvsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/ui/view/outlnvsh.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/ui/view/outlnvsh.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/ui/view/outlnvsh.cxx Wed Dec 18 13:27:09 2013
@@ -235,9 +235,7 @@ OutlineViewShell::OutlineViewShell (
Construct(GetDocSh());
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OutlineText));
-//IAccessibility2 Implementation 2009-----
m_StrOldPageName.EmptyString();
-//-----IAccessibility2 Implementation 2009
}
/*************************************************************************
@@ -1475,14 +1473,12 @@ void OutlineViewShell::GetStatusBarState
aLayoutStr = pPage->GetLayoutName();
aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
- //IAccessibility2 Implementation 2009-----
//Now, CurrentPage property change is already sent for DrawView and OutlineView, so it is not necessary to send again here
if(m_StrOldPageName!=aPageStr)
{
GetViewShellBase().GetDrawController().fireSwitchCurrentPage(nPos);
m_StrOldPageName = aPageStr;
}
- //-----IAccessibility2 Implementation 2009
}
rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) );
rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
Modified: openoffice/branches/ooxml-osba/main/sd/source/ui/view/sdwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/ui/view/sdwindow.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/ui/view/sdwindow.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/ui/view/sdwindow.cxx Wed Dec 18 13:27:09 2013
@@ -45,9 +45,7 @@
#include "AccessibleDrawDocumentView.hxx"
#include "WindowUpdater.hxx"
-//IAccessibility2 Implementation 2009-----
#include <vcl/svapp.hxx>
-//-----IAccessibility2 Implementation 2009
namespace sd {
@@ -1164,7 +1162,6 @@ void Window::DropScroll(const Point& rMo
::com::sun::star::accessibility::XAccessible>
Window::CreateAccessible (void)
{
-//IAccessibility2 Implementation 2009-----
// If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later.
if (mpViewShell && mpViewShell->ISA(PresentationViewShell))
{
@@ -1176,13 +1173,11 @@ void Window::DropScroll(const Point& rMo
return xAcc;
}
if (mpViewShell != NULL)
- //return mpViewShell->CreateAccessibleDocumentView (this);
{
xAcc = mpViewShell->CreateAccessibleDocumentView (this);
SetAccessible(xAcc);
return xAcc;
}
-//-----IAccessibility2 Implementation 2009
else
{
OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
@@ -1190,7 +1185,6 @@ void Window::DropScroll(const Point& rMo
}
}
-//IAccessibility2 Implementation 2009-----
// MT: Removed Windows::SwitchView() introduced with IA2 CWS.
// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
void Window::SwitchView()
@@ -1204,7 +1198,6 @@ void Window::SwitchView()
mpViewShell->SwitchViewFireFocus(GetAccessible(sal_False));
}
}
-//-----IAccessibility2 Implementation 2009
XubString Window::GetSurroundingText() const
{
Modified: openoffice/branches/ooxml-osba/main/sd/source/ui/view/tabcontr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/ui/view/tabcontr.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/ui/view/tabcontr.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/ui/view/tabcontr.cxx Wed Dec 18 13:27:09 2013
@@ -137,12 +137,10 @@ void TabControl::MouseButtonDown(const
Point aPos = PixelToLogic( rMEvt.GetPosPixel() );
sal_uInt16 aPageId = GetPageId(aPos);
-//IAccessibility2 Implementation 2009-----
//Solution: initialize
if(RrePageID!=aPageId)
pDrViewSh->FreshNavigatrEntry();
RrePageID=aPageId;
-//-----IAccessibility2 Implementation 2009
if (aPageId == 0)
{
SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
Modified: openoffice/branches/ooxml-osba/main/sd/source/ui/view/viewshel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/ui/view/viewshel.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/ui/view/viewshel.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/ui/view/viewshel.cxx Wed Dec 18 13:27:09 2013
@@ -95,9 +95,7 @@
#include <editeng/eeitem.hxx>
#include <svl/poolitem.hxx>
#include <glob.hrc>
-//IAccessibility2 Implementation 2009-----
#include "AccessibleDocumentViewBase.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
#define SO2_DECL_SVINPLACEOBJECT_DEFINED
SO2_DECL_REF(SvInPlaceObject)
@@ -481,9 +479,7 @@ sal_Bool ViewShell::KeyInput(const KeyEv
bReturn = (sal_Bool)GetViewShell()->KeyInput(rKEvt);
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 OriCount = GetView()->GetMarkedObjectList().GetMarkCount();
-//-----IAccessibility2 Implementation 2009
if(!bReturn)
{
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
@@ -513,14 +509,12 @@ sal_Bool ViewShell::KeyInput(const KeyEv
}
}
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 EndCount = GetView()->GetMarkedObjectList().GetMarkCount();
// Here, oriCount or endCount must have one value=0, another value > 0, then to switch focus between Document and shape objects
if(bReturn && (OriCount + EndCount > 0) && (OriCount * EndCount == 0))
{
SwitchActiveViewFireFocus();
}
-//-----IAccessibility2 Implementation 2009
if(!bReturn && GetActiveWindow())
{
@@ -1637,7 +1631,6 @@ bool ViewShell::RelocateToParentWindow (
return true;
}
-//IAccessibility2 Implementation 2009-----
void ViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc )
{
if (xAcc.get())
@@ -1666,7 +1659,6 @@ void ViewShell::NotifyAccUpdate( )
GetViewShellBase().GetDrawController().NotifyAccUpdate();
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace sd
Modified: openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfx.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfx.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfx.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfx.hrc Wed Dec 18 13:27:09 2013
@@ -250,9 +250,7 @@
#define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119)
#define STR_SHARED (RID_SFX_START+120)
#define RID_XMLSEC_DOCUMENTSIGNED (RID_SFX_START+121)
-// IAccessibility2 implementation 2009. ------
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
-// ------ IAccessibility2 implementation 2009.
//=========================================================================
Modified: openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfxuno.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfxuno.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfxuno.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/inc/sfx2/sfxuno.hxx Wed Dec 18 13:27:09 2013
@@ -105,11 +105,6 @@ bool GetEncryptionData_Impl( const SfxIt
#define FrameSearchFlags sal_Int32
-// Macros to convert string -> unicode and unicode -> string.
-// We use UTF8 everytime. Its the best way to do this!
-#define S2U(STRING) ::rtl::OStringToOUString(STRING, RTL_TEXTENCODING_UTF8)
-#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
-
// Macro to define const unicode a'la "..."
// It's better then "OUString::createFromAscii(...)" !!!
#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/appl/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/appl/app.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/appl/app.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/appl/app.cxx Wed Dec 18 13:27:09 2013
@@ -553,8 +553,7 @@ short SfxApplication::QuerySave_Impl( Sf
ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
{
- String aMgrName = String::CreateFromAscii( pPrefix );
- return ResMgr::CreateResMgr(U2S(aMgrName));
+ return ResMgr::CreateResMgr( pPrefix);
}
//---------------------------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/appl/appdde.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/appl/appdde.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/appl/appdde.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/appl/appdde.cxx Wed Dec 18 13:27:09 2013
@@ -54,14 +54,14 @@
String SfxDdeServiceName_Impl( const String& sIn )
{
- ByteString sTemp = U2S( sIn );
+ ByteString sTemp( sIn, RTL_TEXTENCODING_UTF8 );
ByteString sReturn;
for ( sal_uInt16 n = sTemp.Len(); n; --n )
if ( sTemp.Copy( n-1, 1 ).IsAlphaNumericAscii() )
sReturn += sTemp.GetChar(n-1);
- return S2U( sReturn );
+ return String( sReturn, RTL_TEXTENCODING_UTF8 );
}
@@ -159,7 +159,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEv
}
aData.EraseAllChars( 0x0022 );
ApplicationAddress aAddr;
- rAppEvent = ApplicationEvent( String(), aAddr, U2S(rEvent), aData );
+ rAppEvent = ApplicationEvent( String(), aAddr, ByteString( rEvent, RTL_TEXTENCODING_UTF8), aData );
return sal_True;
}
}
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/appl/sfxhelp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/appl/sfxhelp.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/appl/sfxhelp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/appl/sfxhelp.cxx Wed Dec 18 13:27:09 2013
@@ -274,7 +274,7 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl
::rtl::OUString aCodedList;
if ( pValues[nProp] >>= aCodedList )
{
- rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 );
+ const rtl::OString aTmp( OUStringToOString( aCodedList, RTL_TEXTENCODING_UTF8 ));
sal_Int32 nIndex = 0;
do
{
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdownicon.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdownicon.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdownicon.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdownicon.cxx Wed Dec 18 13:27:09 2013
@@ -904,10 +904,10 @@ void ShutdownIcon::SetAutostart( bool bA
osl_getThreadTextEncoding() );
OString aShortcutUnx = OUStringToOString( aShortcut,
osl_getThreadTextEncoding() );
- if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+ if ((0 != symlink( aDesktopFileUnx.getStr(), aShortcutUnx.getStr())) && (errno == EEXIST))
{
- unlink(aShortcutUnx);
- symlink(aDesktopFileUnx, aShortcutUnx);
+ unlink( aShortcutUnx.getStr());
+ symlink( aDesktopFileUnx.getStr(), aShortcutUnx.getStr());
}
ShutdownIcon *pIcon = ShutdownIcon::createInstance();
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdowniconunx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdowniconunx.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdowniconunx.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/appl/shutdowniconunx.cxx Wed Dec 18 13:27:09 2013
@@ -176,7 +176,7 @@ static void add_item( GtkMenuShell *pMen
GtkWidget *pImage = gtk_image_new_from_pixbuf( pPixbuf );
g_object_unref( G_OBJECT( pPixbuf ) );
- GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel );
+ GtkWidget* pMenuItem = gtk_image_menu_item_new_with_label( aLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage );
g_signal_connect_data( pMenuItem, "activate", pFnCallback, pURL,
oustring_delete, GConnectFlags(0));
@@ -224,11 +224,9 @@ add_image_menu_item( GtkMenuShell *pMenu
{
OString aUtfLabel = rtl::OUStringToOString (aLabel, RTL_TEXTENCODING_UTF8 );
- GtkWidget *pImage;
- pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU );
+ GtkWidget* pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU );
- GtkWidget *pMenuItem;
- pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel );
+ GtkWidget* pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage );
gtk_menu_shell_append( pMenuShell, pMenuItem );
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/mieclip.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/mieclip.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/mieclip.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/mieclip.cxx Wed Dec 18 13:27:09 2013
@@ -63,7 +63,7 @@ SvStream* MSE40HTMLClipFormatObj::IsVali
else if( sTmp == "EndHTML" )
nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
else if( sTmp == "SourceURL" )
- sBaseURL = String(S2U(sLine.Erase( 0, nIndex )));
+ sBaseURL = String( sLine.Erase( 0, nIndex ), RTL_TEXTENCODING_UTF8);
if( nEnd && nStt &&
( sBaseURL.Len() || rStream.Tell() >= nStt ))
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/sfxhtml.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/sfxhtml.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/sfxhtml.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/bastyp/sfxhtml.cxx Wed Dec 18 13:27:09 2013
@@ -325,7 +325,7 @@ sal_Bool SfxHTMLParser::FinishFileDownlo
sal_Char* pBuffer = sBuffer.AllocBuffer(nLen);
aStream.Seek( 0 );
aStream.Read((void*)pBuffer, nLen);
- rStr = String( S2U(pBuffer) );
+ rStr = String( pBuffer, RTL_TEXTENCODING_UTF8);
}
delete pDLMedium;
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/control/macro.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/control/macro.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/control/macro.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/control/macro.cxx Wed Dec 18 13:27:09 2013
@@ -334,7 +334,7 @@ void SfxMacroStatement::GenerateNameAndA
aStatement += '.';
// der Name des Slots ist der Name der Methode / des Properties
- aStatement += String::CreateFromAscii(rSlot.pName);
+ aStatement += String( rtl::OStringToOUString( rSlot.pName, RTL_TEXTENCODING_UTF8));
if ( rSlot.IsMode(SFX_SLOT_METHOD) )
aStatement += DEFINE_CONST_UNICODE("( ");
else
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/control/msg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/control/msg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/control/msg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/control/msg.cxx Wed Dec 18 13:27:09 2013
@@ -65,7 +65,6 @@ sal_uInt16 SfxSlot::GetWhich( const SfxI
::rtl::OUString SfxSlot::GetCommandString() const
{
- rtl::OString aCmd(GetCommand());
- return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 );
+ return rtl::OStringToOUString( GetCommand(), RTL_TEXTENCODING_UTF8);
}
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/control/shell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/control/shell.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/control/shell.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/control/shell.cxx Wed Dec 18 13:27:09 2013
@@ -1115,7 +1115,7 @@ void SfxShell::SetVerbs(const com::sun::
pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState);
pNewSlot->pType = 0; HACK(SFX_TYPE(SfxVoidItem))
- pNewSlot->pName = U2S(aVerbs[n].VerbName);
+ pNewSlot->pName = OUStringToOString( aVerbs[n].VerbName, RTL_TEXTENCODING_UTF8).getStr(); // TODO: life time of temp is suspicious!!!
pNewSlot->pLinkedSlot = 0;
pNewSlot->nArgDefCount = 0;
pNewSlot->pFirstArgDef = 0;
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/dialog/dinfdlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/dialog/dinfdlg.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/dialog/dinfdlg.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/dialog/dinfdlg.hrc Wed Dec 18 13:27:09 2013
@@ -149,9 +149,7 @@
#define STR_HEADER_VALUE 92
#define STR_HEADER_ACTION 93
-//IAccessibility2 Implementation 2009-----
#define EDIT_FILE_NAME 94
-//-----IAccessibility2 Implementation 2009
#define PB_OK 100
#define PB_CANCEL 101
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/dialog/passwd.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/dialog/passwd.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/dialog/passwd.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/dialog/passwd.hrc Wed Dec 18 13:27:09 2013
@@ -42,9 +42,7 @@
#define FT_PASSWD_CONFIRM2 27
#define ED_PASSWD_CONFIRM2 28
-//IAccessibility2 Implementation 2009-----
#define TEXT_PASSWD 31
-//-----IAccessibility2 Implementation 2009
#endif
// ******************************************************************* EOF
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/dialog/tabdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/dialog/tabdlg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/dialog/tabdlg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/dialog/tabdlg.cxx Wed Dec 18 13:27:09 2013
@@ -748,7 +748,6 @@ void SfxTabDialog::Start( sal_Bool bShow
if ( bShow )
Show();
-// IAccessibility2 implementation 2009
if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) )
GrabFocusToFirstControl();
}
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/dialog/templdlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/dialog/templdlg.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/dialog/templdlg.hrc (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/dialog/templdlg.hrc Wed Dec 18 13:27:09 2013
@@ -44,8 +44,3 @@
#define BT_FLIST 8
#define BT_VLIST 9
#define BT_TOOL 10
-
-//IAccessibility2 Implementation 2009-----
-#define STR_STYLE_ELEMTLIST 18
-//-----IAccessibility2 Implementation 2009
-
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/menu/mnuitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/menu/mnuitem.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/menu/mnuitem.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/menu/mnuitem.cxx Wed Dec 18 13:27:09 2013
@@ -291,10 +291,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxBoolItem not allowed for SID_OBJECTMENUx" );
bCheck = ((const SfxBoolItem*)pState)->GetValue();
- // IAccessibility2 implementation 2009. ------
Menu* pMenu = pOwnMenu->GetSVMenu();
pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
- // ------ IAccessibility2 implementation 2009.
}
else if ( pState->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pState)->HasBoolValue() )
@@ -303,10 +301,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxEnumItem not allowed for SID_OBJECTMENUx" );
bCheck = ((SfxEnumItemInterface *)pState)->GetBoolValue();
- // IAccessibility2 implementation 2009. ------
Menu* pMenu = pOwnMenu->GetSVMenu();
pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
- // ------ IAccessibility2 implementation 2009.
}
else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) )
{
Modified: openoffice/branches/ooxml-osba/main/sfx2/source/view/viewfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sfx2/source/view/viewfrm.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sfx2/source/view/viewfrm.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sfx2/source/view/viewfrm.cxx Wed Dec 18 13:27:09 2013
@@ -683,13 +683,11 @@ void SfxViewFrame::ExecReload_Impl( SfxR
if( pSalvageItem )
{
aURL = pSalvageItem->GetValue();
- // IAccessibility2 implementation 2009. ------
if (pNewSet)
{
pNewSet->ClearItem( SID_ORIGURL );
pNewSet->ClearItem( SID_DOC_SALVAGE );
}
- // ------ IAccessibility2 implementation 2009.
}
// TODO/LATER: Temporary solution, the SfxMedium must know the original URL as aLogicName
@@ -3385,7 +3383,6 @@ void SfxViewFrame::ChildWindowExecute( S
sal_Bool bShow = sal_False;
sal_Bool bHasChild = HasChildWindow(nSID);
bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
- // IAccessibility2 implementation 2009. ------
GetDispatcher()->Update_Impl( sal_True );
// ausf"uhren
@@ -3393,9 +3390,6 @@ void SfxViewFrame::ChildWindowExecute( S
ToggleChildWindow( nSID );
GetBindings().Invalidate( nSID );
- // Move to the before show()
- //GetDispatcher()->Update_Impl( sal_True );
- // ------ IAccessibility2 implementation 2009.
// ggf. recorden
if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )
Modified: openoffice/branches/ooxml-osba/main/solenv/bin/deliver.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/deliver.pl?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/deliver.pl (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/deliver.pl Wed Dec 18 13:27:09 2013
@@ -136,6 +136,7 @@ use sigtrap 'handler' => \&cleanup_and_d
#### main ####
parse_options();
+init_globals();
print "$script_name -- version: $script_rev\n" if !$opt_silent;
@@ -149,7 +150,6 @@ if ( ! $opt_delete ) {
}
}
-init_globals();
push_default_actions();
parse_dlst();
check_dlst() if $opt_checkdlst;
@@ -463,7 +463,9 @@ sub init_globals
my $updminor = $ENV{'UPDMINOR'};
my $updminorext = $ENV{'UPDMINOREXT'};
my $work_stamp = $ENV{'WORK_STAMP'};
-
+
+ $::CC_PATH=(fileparse( $ENV{"CC"}))[1];
+
# special security check for release engineers
if ( defined($updater) && !defined($build_sosl) && !$opt_force) {
my $path = getcwd();
@@ -735,8 +737,9 @@ sub is_unstripped {
sub initialize_strip {
if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) {
$strip .= 'guw ' if ($^O eq 'cygwin');
+ $strip .= $::CC_PATH if (-e $::CC_PATH.'/strip');
$strip .= 'strip';
- $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
+ $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
$strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
};
};
Modified: openoffice/branches/ooxml-osba/main/solenv/bin/macosx-change-install-names.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/macosx-change-install-names.pl?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/macosx-change-install-names.pl (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/macosx-change-install-names.pl Wed Dec 18 13:27:09 2013
@@ -106,7 +106,7 @@ if ($type eq "extshl")
{
foreach $file (@ARGV)
{
- my $call = "install_name_tool$change -id \@loader_path/$inames{$file} $file";
+ my $call = "${::CC_PATH}install_name_tool$change -id \@loader_path/$inames{$file} $file";
system($call) == 0 or die "cannot $call";
}
}
@@ -114,14 +114,14 @@ if ($type eq "extshl")
{
foreach $file (@ARGV)
{
- my $call = "install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
+ my $call = "${::CC_PATH}install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
system($call) == 0 or die "cannot $call";
}
}
}
foreach $file (@ARGV)
{
- my $call = "otool -L $file";
+ my $call = "${::CC_PATH}otool -L $file";
open(IN, "-|", $call) or die "cannot $call";
my $change = "";
while (<IN>)
@@ -132,7 +132,7 @@ foreach $file (@ARGV)
close(IN);
if ($change ne "")
{
- $call = "install_name_tool$change $file";
+ $call = "${::CC_PATH}install_name_tool$change $file";
system($call) == 0 or die "cannot $call";
}
}
Modified: openoffice/branches/ooxml-osba/main/solenv/bin/macosx-dylib-link-list.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/solenv/bin/macosx-dylib-link-list.pl?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/solenv/bin/macosx-dylib-link-list.pl (original)
+++ openoffice/branches/ooxml-osba/main/solenv/bin/macosx-dylib-link-list.pl Wed Dec 18 13:27:09 2013
@@ -64,7 +64,7 @@ foreach (@ARGV)
}
foreach $file (@todo)
{
- my $call = "otool -L $file";
+ my $call = "${::CC_PATH}otool -L $file";
open(IN, "-|", $call) or die "cannot $call";
while (<IN>)
{