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 [7/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/s...
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.cxx Wed Dec 18 13:27:09 2013
@@ -2100,7 +2100,6 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window
aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl));
aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl));
- //IAccessibility2 Implementation 2009-----
// Move down from the position before FreeResource()
// For lost help ID issue
aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/autocdlg.hrc Wed Dec 18 13:27:09 2013
@@ -150,7 +150,6 @@
#define FT_SMARTTAGS 221
#define LB_SMARTTAGS 222
#define PB_SMARTTAGS 223
-//IAccessibility2 Implementation 2009-----
#define STR_PB_NEWABBREV 224
#define STR_PB_DELABBREV 225
#define STR_PB_NEWDOUBLECAPS 226
@@ -161,7 +160,6 @@
#define STR_PB_DBL_START 231
#define STR_PB_SGL_END 232
#define STR_PB_DBL_END 233
-//-----IAccessibility2 Implementation 2009
#endif
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/connect.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/connect.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/connect.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/connect.hrc Wed Dec 18 13:27:09 2013
@@ -39,5 +39,4 @@
#define FT_TYPE 8
#define LB_TYPE 1
#define CTL_PREVIEW 1
-//IAccessibility2 Implementation 2009-----
#define STR_EXAMPLE 1
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/paragrph.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/paragrph.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/paragrph.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/paragrph.hrc Wed Dec 18 13:27:09 2013
@@ -113,9 +113,7 @@
#define CB_AS_SCRIPT_SPACE 7
-//IAccessibility2 Implementation 2009-----
#define STR_EXAMPLE 5010
#define STR_PAGE_STYLE 5011
-//-----IAccessibility2 Implementation 2009
#endif
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.hrc Wed Dec 18 13:27:09 2013
@@ -181,7 +181,5 @@
#define IMG_LOAD_H 23
#define IMG_SAVE_H 24
-// IAccessibility2 implementation 2009 ------
#define STR_CUI_COLORMODEL 5030
#define STR_LB_HATCHINGSTYLE 5031
-// ------ IAccessibility2 implementation 2009.
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.src?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.src (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabarea.src Wed Dec 18 13:27:09 2013
@@ -875,9 +875,7 @@ TabPage RID_SVXPAGE_BITMAP
Pos = MAP_APPFONT ( 12 , 25 ) ;
Size = MAP_APPFONT ( 72 , 72 ) ;
TabStop = TRUE ;
- //IAccessibility2 Implementation 2009-----
Text [ en-US ] = "Pattern Editor";
- //-----IAccessibility2 Implementation 2009
};
FixedText FT_COLOR
{
@@ -1319,18 +1317,14 @@ TabPage RID_SVXPAGE_COLOR
Border = TRUE;
Pos = MAP_APPFONT ( 157 , 14 ) ;
Size = MAP_APPFONT ( 34 , 25 ) ;
- // IAccessibility2 implementation 2009. ------
Text [ en-US ] = "Old Color" ;
- // ------ IAccessibility2 implementation 2009.
};
Control CTL_PREVIEW_NEW
{
Border = TRUE;
Pos = MAP_APPFONT ( 157, 39 ) ;
Size = MAP_APPFONT ( 34 , 25 ) ;
- // IAccessibility2 implementation 2009. ------
Text [ en-US ] = "New Color" ;
- // ------ IAccessibility2 implementation 2009.
};
ListBox LB_COLORMODEL
{
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabline.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabline.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabline.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabline.hrc Wed Dec 18 13:27:09 2013
@@ -37,7 +37,6 @@
#define FT_LINE_ENDS_WIDTH 6
#define LB_START_STYLE 3
#define LB_END_STYLE 4
-//IAccessibility2 Impplementaton 2009-----
#define STR_STYLE (LB_END_STYLE+1)
#define STR_LB_START_STYLE 30
#define STR_LB_END_STYLE 31
@@ -51,7 +50,6 @@
#define STR_END_NUM 39
#define STR_START_LENGTH 40
#define STR_END_LENGTH 41
-//-----IAccessibility2 Impplementaton 2009
#define MTR_FLD_START_WIDTH 3
#define MTR_FLD_END_WIDTH 2
#define CBX_SYNCHRONIZE 1
@@ -121,12 +119,10 @@
#define MN_GALLERY_ENTRY 100
/*
-//IAccessibility2 Implementation 2009-----
#define STR_START_TYPE 1
#define STR_END_TYPE 2
#define STR_START_NUM 3
#define STR_END_NUM 4
#define STR_START_LENGTH 5
#define STR_END_LENGTH 6
-//-----IAccessibility2 Implementation 2009
*/
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabstpge.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabstpge.hrc?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabstpge.hrc (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/tabstpge.hrc Wed Dec 18 13:27:09 2013
@@ -55,8 +55,6 @@
#define BTN_DELALL 52
#define ST_LEFTTAB_ASIAN 53
#define ST_RIGHTTAB_ASIAN 54
-//IAccessibility2 Implementation 2009-----
#define ST_FILLCHAR_OTHER 55
-//-----IAccessibility2 Implementation 2009
#endif
Modified: openoffice/branches/ooxml-osba/main/cui/source/tabpages/tparea.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/cui/source/tabpages/tparea.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/cui/source/tabpages/tparea.cxx (original)
+++ openoffice/branches/ooxml-osba/main/cui/source/tabpages/tparea.cxx Wed Dec 18 13:27:09 2013
@@ -2213,11 +2213,9 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHd
aMtrFldYOffset.Show();
aFlPosition.Show();
aRbtRow.Show();
-//IAccessible2 Implementation 2009-----
//Solution:Check one when initializing.
if(!aRbtRow.IsChecked()&&!aRbtColumn.IsChecked())
aRbtRow.Check();
-//-----IAccessible2 Implementation 2009
aRbtColumn.Show();
aMtrFldOffset.Show();
aFlOffset.Show();
Modified: openoffice/branches/ooxml-osba/main/dbaccess/source/core/recovery/dbdocrecovery.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dbaccess/source/core/recovery/dbdocrecovery.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dbaccess/source/core/recovery/dbdocrecovery.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dbaccess/source/core/recovery/dbdocrecovery.cxx Wed Dec 18 13:27:09 2013
@@ -394,7 +394,7 @@ namespace dbaccess
message.append( "' not found in '" );
message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) );
message.append( "', but required per map file!" );
- OSL_ENSURE( false, message.makeStringAndClear() );
+ OSL_ENSURE( false, message.getStr() );
#endif
continue;
}
Modified: openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/brwctrlr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/brwctrlr.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/brwctrlr.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/brwctrlr.cxx Wed Dec 18 13:27:09 2013
@@ -2013,7 +2013,7 @@ void SbaXDataBrowserController::ExecuteS
Reference< XInterface > xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY);
::rtl::OUString aInitialText;
if (IsSearchableControl(xCurControl, &aInitialText))
- sInitialText = (const sal_Unicode*)aInitialText;
+ sInitialText = aInitialText.getStr();
// prohibit the synchronization of the grid's display with the cursor's position
Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY);
@@ -2569,7 +2569,7 @@ IMPL_LINK(SbaXDataBrowserController, OnS
Reference< XPropertySet > xCurrentColModel(xModelColumns->getByIndex(nModelPos),UNO_QUERY);
::rtl::OUString aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(PROPERTY_CONTROLSOURCE));
- sFieldList += (const sal_Unicode*)aName;
+ sFieldList += aName.getStr();
sFieldList += ';';
pContext->arrFields.push_back(xCurrentColumn);
Modified: openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/exsrcbrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/exsrcbrw.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/exsrcbrw.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dbaccess/source/ui/browser/exsrcbrw.cxx Wed Dec 18 13:27:09 2013
@@ -202,7 +202,7 @@ void SAL_CALL SbaExternalSourceBrowser::
aControlProps = *(Sequence< ::com::sun::star::beans::PropertyValue>*)pArguments->Value.getValue();
}
else
- OSL_ENSURE(sal_False, ((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString((const sal_Unicode*)pArguments->Name, gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer());
+ OSL_ENSURE(sal_False, ((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString(pArguments->Name.getStr(), gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer());
}
if (!sControlType.getLength())
{
Modified: openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/TokenWriter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/TokenWriter.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/TokenWriter.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/TokenWriter.cxx Wed Dec 18 13:27:09 2013
@@ -76,6 +76,8 @@ using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::util;
using ::com::sun::star::frame::XModel;
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
+
#if defined(UNX)
const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012';
#else
@@ -819,7 +821,7 @@ void OHTMLImportExport::WriteBody()
IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style );
(*m_pStream) << sMyBegComment; OUT_LF();
- (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(), gsl_getSystemTextEncoding()) << '\"';
+ (*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OUStringToOString( m_aFont.Name, gsl_getSystemTextEncoding()) << '\"';
// TODO : think about the encoding of the font name
(*m_pStream) << "; " << sFontSize;
m_pStream->WriteNumber(m_aFont.Height);
@@ -895,14 +897,14 @@ void OHTMLImportExport::WriteTables()
aStrOut = aStrOut + "=1";
IncIndent(1);
- TAG_ON( aStrOut );
+ TAG_ON( aStrOut.getStr() );
FontOn();
TAG_ON( OOO_STRING_SVTOOLS_HTML_caption );
TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
- (*m_pStream) << ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding());
+ (*m_pStream) << ::rtl::OUStringToOString( m_sName, gsl_getSystemTextEncoding());
// TODO : think about the encoding of the name
TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption );
@@ -1072,7 +1074,7 @@ void OHTMLImportExport::WriteCell( sal_I
}
}
- TAG_ON( aStrTD );
+ TAG_ON( aStrTD.getStr() );
FontOn();
@@ -1116,7 +1118,7 @@ void OHTMLImportExport::FontOn()
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_face;
aStrOut = aStrOut + "=";
aStrOut = aStrOut + "\"";
- aStrOut = aStrOut + ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(),gsl_getSystemTextEncoding());
+ aStrOut = aStrOut + ::rtl::OUStringToOString( m_aFont.Name, gsl_getSystemTextEncoding());
// TODO : think about the encoding of the font name
aStrOut = aStrOut + "\"";
aStrOut = aStrOut + " ";
Modified: openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/UITools.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/UITools.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dbaccess/source/ui/misc/UITools.cxx Wed Dec 18 13:27:09 2013
@@ -1500,7 +1500,7 @@ namespace
aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
aURL.Complete += _sModuleName;
aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
- aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8);
+ aURL.Complete += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8);
::rtl::OUString sAnchor;
::rtl::OUString sTempURL = aURL.Complete;
Modified: openoffice/branches/ooxml-osba/main/dbaccess/source/ui/querydesign/querycontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dbaccess/source/ui/querydesign/querycontroller.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dbaccess/source/ui/querydesign/querycontroller.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dbaccess/source/ui/querydesign/querycontroller.cxx Wed Dec 18 13:27:09 2013
@@ -178,7 +178,7 @@ namespace dbaui
{
rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:");
::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID());
- rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
+ rString += ::rtl::OStringToOUString( sT, RTL_TEXTENCODING_UTF8);
break;}
case SQL_NODE_COMPARISON:
Modified: openoffice/branches/ooxml-osba/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/desktop/source/app/app.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/ooxml-osba/main/desktop/source/app/app.cxx Wed Dec 18 13:27:09 2013
@@ -253,12 +253,12 @@ ResMgr* Desktop::GetDesktopResManager()
{
if ( !Desktop::pResMgr )
{
- String aMgrName = String::CreateFromAscii( "dkt" );
+ const char* pMgrName = "dkt";
// Create desktop resource manager and bootstrap process
// was successful. Use default way to get language specific message.
if ( Application::IsInExecute() )
- Desktop::pResMgr = ResMgr::CreateResMgr( U2S( aMgrName ));
+ Desktop::pResMgr = ResMgr::CreateResMgr( pMgrName);
if ( !Desktop::pResMgr )
{
@@ -268,7 +268,7 @@ ResMgr* Desktop::GetDesktopResManager()
/*
LanguageType aLanguageType = LANGUAGE_DONTKNOW;
- Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLanguageType );
+ Desktop::pResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLanguageType );
AllSettings as = GetSettings();
as.SetUILanguage(aLanguageType);
SetSettings(as);
@@ -282,7 +282,7 @@ ResMgr* Desktop::GetDesktopResManager()
::com::sun::star::lang::Locale aLocale( aLanguage, aCountry, aVariant );
- Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale);
+ Desktop::pResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLocale);
AllSettings as = GetSettings();
as.SetUILocale(aLocale);
SetSettings(as);
@@ -1935,17 +1935,14 @@ void Desktop::Main()
// set static variable to enabled/disable crash reporter
retrieveCrashReporterState();
- if ( !isCrashReporterEnabled() )
- {
- osl_setErrorReporting( sal_False );
- // disable stack trace feature
- }
+ const bool bCrashReporterEnabled = isCrashReporterEnabled();
+ osl_setErrorReporting( !bCrashReporterEnabled );
// create title string
sal_Bool bCheckOk = sal_False;
::com::sun::star::lang::Locale aLocale;
- String aMgrName = String::CreateFromAscii( "ofa" );
- ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale );
+ const char* pMgrName = "ofa";
+ ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLocale );
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
delete pLabelResMgr;
Modified: openoffice/branches/ooxml-osba/main/desktop/source/app/appfirststart.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/desktop/source/app/appfirststart.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/desktop/source/app/appfirststart.cxx (original)
+++ openoffice/branches/ooxml-osba/main/desktop/source/app/appfirststart.cxx Wed Dec 18 13:27:09 2013
@@ -71,7 +71,7 @@ OUString Desktop::GetLicensePath()
AllSettings aSettings(Application::GetSettings());
aLocale = aSettings.GetUILocale();
- ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+ ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr( aMgrName.getStr(), aLocale);
aLangString = aLocale.Language;
if ( aLocale.Country.getLength() != 0 )
Modified: openoffice/branches/ooxml-osba/main/desktop/source/deployment/misc/dp_platform.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/desktop/source/deployment/misc/dp_platform.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/desktop/source/deployment/misc/dp_platform.cxx (original)
+++ openoffice/branches/ooxml-osba/main/desktop/source/deployment/misc/dp_platform.cxx Wed Dec 18 13:27:09 2013
@@ -59,6 +59,7 @@
#define PLATFORM_FREEBSD_X86 "freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
+#define PLATFORM_MACOSX_X86_64 "macosx_x86_64"
#define PLATFORM_MACOSX_PPC "macosx_powerpc"
#define PLATFORM_OS2_X86 "os2_x86"
@@ -169,6 +170,8 @@ namespace
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
+ else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64)))
+ ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
Modified: openoffice/branches/ooxml-osba/main/desktop/source/migration/wizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/desktop/source/migration/wizard.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/desktop/source/migration/wizard.cxx (original)
+++ openoffice/branches/ooxml-osba/main/desktop/source/migration/wizard.cxx Wed Dec 18 13:27:09 2013
@@ -108,10 +108,7 @@ ResMgr *FirstStartWizard::pResMgr = 0;
ResMgr *FirstStartWizard::GetResManager()
{
if ( !FirstStartWizard::pResMgr )
- {
- String aMgrName = String::CreateFromAscii( "dkt" );
- FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString( aMgrName, RTL_TEXTENCODING_UTF8 ));
- }
+ FirstStartWizard::pResMgr = ResMgr::CreateResMgr( "dkt");
return FirstStartWizard::pResMgr;
}
Modified: openoffice/branches/ooxml-osba/main/dtrans/source/cnttype/mcnttype.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/dtrans/source/cnttype/mcnttype.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/dtrans/source/cnttype/mcnttype.cxx (original)
+++ openoffice/branches/ooxml-osba/main/dtrans/source/cnttype/mcnttype.cxx Wed Dec 18 13:27:09 2013
@@ -327,7 +327,7 @@ OUString SAL_CALL CMimeContentType::pVal
throw IllegalArgumentException( );
// remove the last quote-sign
- OUString qpvalue( pvalue, pvalue.getLength( ) - 1 );
+ const OUString qpvalue( pvalue.getStr(), pvalue.getLength( ) - 1 );
pvalue = qpvalue;
if ( !pvalue.getLength( ) )
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx Wed Dec 18 13:27:09 2013
@@ -373,13 +373,11 @@ namespace accessibility
/// Check whether 0<=nStart<=n and 0<=nEnd<=n
void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException));
-//IAccessibility2 Implementation 2009-----
void _correctValues( const sal_Int32 nIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
sal_Int32 SkipField(sal_Int32 nIndex, sal_Bool bForward);
// get overlapped field, extend return string. Only extend forward for now
sal_Bool ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment );
String GetFieldTypeNameAtIndex(sal_Int32 nIndex);
-//-----IAccessibility2 Implementation 2009
// the paragraph index in the edit engine (guarded by solar mutex)
sal_Int32 mnParagraphIndex;
@@ -407,14 +405,12 @@ namespace accessibility
/// Our listeners (guarded by maMutex)
int mnNotifierClientId;
- //IAccessibility2 Implementation 2009-----
public:
void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > & ref)
{ m_xAccInfo = ref ;}
private:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccInfo;
//virtual sal_Bool IsShapeParaFocusable( );
- //-----IAccessibility2 Implementation 2009
// --> OD 2006-01-11 #i27138#
// the paragraph manager, which created this instance - is NULL, if
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editdata.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editdata.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editdata.hxx Wed Dec 18 13:27:09 2013
@@ -364,9 +364,7 @@ enum EENotifyType
/// Denotes the end of a high-level action triggered by a key press
EE_NOTIFY_INPUT_END,
-//IAccessibility2 Implementation 2009-----
EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA
-//-----IAccessibility2 Implementation 2009
};
struct EENotify
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editeng.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editeng.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editeng.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editeng.hxx Wed Dec 18 13:27:09 2013
@@ -108,9 +108,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHa
#define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04
#define GETATTRIBS_ALL (sal_uInt8)0xFF
-//IAccessibility2 Implementation 2009-----
class SdrObject;
-//-----IAccessibility2 Implementation 2009
class EDITENG_DLLPUBLIC EditEngine
{
friend class EditView;
@@ -475,9 +473,7 @@ public:
static void ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
static sal_Bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
static sal_Bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
- //IAccessibility2 Implementation 2009-----
virtual SdrObject* GetCurTextObj() { return NULL; }
- //-----IAccessibility2 Implementation 2009
/** sets a link that is called at the beginning of a drag operation at an edit view */
void SetBeginDropHdl( const Link& rLink );
Link GetBeginDropHdl() const;
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editview.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editview.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/editview.hxx Wed Dec 18 13:27:09 2013
@@ -219,10 +219,8 @@ public:
sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
- //IAccessibility2 Implementation 2009-----
sal_Bool IsShapeParaFocusable( ) ;
sal_Bool WrongSpelledBreakPara(sal_Int32 nPara,sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,sal_Int32 nIndex);
- //-----IAccessibility2 Implementation 2009
void SpellIgnoreWord();
void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/splwrap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/splwrap.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/splwrap.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/splwrap.hxx Wed Dec 18 13:27:09 2013
@@ -39,7 +39,6 @@ namespace com { namespace sun { namespac
}}}}
class Window;
-//IAccessibility2 Impplementaton 2009-----
class SdrObject;
// misc functions ---------------------------------------------------------------
@@ -62,7 +61,6 @@ private:
::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph;
-//IAccessibility2 Impplementaton 2009-----
SdrObject* mpTextObj;
sal_uInt16 nOldLang; // Sprache merken, nur bei Aenderung SetLanguage rufen
sal_Bool bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen
@@ -154,10 +152,8 @@ protected:
virtual void AutoCorrect( const String& rAktStr, const String& rNewStr );
virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen
-//IAccessibility2 Impplementaton 2009-----
void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; }
SdrObject* GetCurTextObj() { return mpTextObj; }
-//-----IAccessibility2 Impplementaton 2009
};
#endif
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedhlp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedhlp.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedhlp.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedhlp.hxx Wed Dec 18 13:27:09 2013
@@ -60,7 +60,6 @@ public:
void SetStartValue( sal_uLong n );
void SetEndValue( sal_uLong n );
};
-//IAccessibility2 Implementation 2009-----
class SvxEditSourceHintEndPara :public SvxEditSourceHint
{
public:
@@ -70,7 +69,6 @@ public:
SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 )
:SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; }
};
-//-----IAccessibility2 Implementation 2009
/** Helper class for common functionality in edit sources
*/
class EDITENG_DLLPUBLIC SvxEditSourceHelper
@@ -107,10 +105,8 @@ public:
@return sal_True, if the range has been successfully determined
*/
- //IAccessibility2 Implementation 2009-----
//static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex );
static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell=sal_False );
- //-----IAccessibility2 Implementation 2009
/** Convert point from edit engine to user coordinate space
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedprx.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedprx.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedprx.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedprx.hxx Wed Dec 18 13:27:09 2013
@@ -74,7 +74,6 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
virtual void SetUpdateModeForAcc( sal_Bool bUp);
virtual sal_Bool GetUpdateModeForAcc() const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedsrc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedsrc.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedsrc.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoedsrc.hxx Wed Dec 18 13:27:09 2013
@@ -219,12 +219,10 @@ public:
Index of paragraph to query bullet info on
*/
virtual EBulletInfo GetBulletInfo( sal_uInt16 nPara ) const = 0;
-//IAccessibility2 Implementation 2009-----
virtual String GetNumStr(sal_uInt16) const { return XubString();};
//IAccessible2 migration fix
virtual void SetUpdateModeForAcc( sal_Bool ) {};
virtual sal_Bool GetUpdateModeForAcc() const { return sal_True; };
-//-----IAccessibility2 Implementation 2009
/** Query the bounding rectangle of the given character
@param nPara[0 .. n]
@@ -336,10 +334,8 @@ public:
@return sal_True, if the range has been successfully determined
*/
- //IAccessibility2 Implementation 2009-----
// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0;
- //-----IAccessibility2 Implementation 2009
/** Query number of lines in the formatted paragraph
@@ -550,11 +546,9 @@ public:
*/
virtual sal_Bool Paste() = 0;
-//IAccessibility2 Implementation 2009-----
virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){ return sal_False; };
-//-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unofored.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unofored.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unofored.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unofored.hxx Wed Dec 18 13:27:09 2013
@@ -72,10 +72,7 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
-// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
- //-----IAccessibility2 Implementation 2009
virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoforou.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoforou.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoforou.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unoforou.hxx Wed Dec 18 13:27:09 2013
@@ -93,10 +93,7 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
-// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
- //-----IAccessibility2 Implementation 2009
virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const;
Modified: openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unotext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unotext.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unotext.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/inc/editeng/unotext.hxx Wed Dec 18 13:27:09 2013
@@ -218,10 +218,7 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
-// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
- //-----IAccessibility2 Implementation 2009
virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
Modified: openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Wed Dec 18 13:27:09 2013
@@ -76,13 +76,11 @@
#include "AccessibleHyperlink.hxx"
#include <svtools/colorcfg.hxx>
-//IAccessibility2 Implementation 2009-----
#include <algorithm>
using namespace std;
#include "editeng.hrc"
#include <editeng/eerdll.hxx>
#include <editeng/numitem.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -97,7 +95,6 @@ using namespace ::com::sun::star::access
namespace accessibility
{
-//IAccessibility2 Implementation 2009-----
const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet()
{
@@ -224,12 +221,10 @@ namespace accessibility
DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" );
rBoundary.startPos = 0;
- //IAccessibility2 Implementation 2009-----
//rBoundary.endPos = GetTextLen();
::rtl::OUString sText( implGetText() );
sal_Int32 nLength = sText.getLength();
rBoundary.endPos = nLength;
- //-----IAccessibility2 Implementation 2009
}
void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
@@ -387,9 +382,7 @@ namespace accessibility
Dispose();
}
-//IAccessibility2 Implementation 2009-----
mpEditSource = pEditSource;
-//-----IAccessibility2 Implementation 2009
// #108900# Init last text content
try
{
@@ -765,11 +758,9 @@ namespace accessibility
!pStateSet->contains(nStateId) )
{
pStateSet->AddState( nStateId );
-//IAccessibility2 Implementation 2009-----
// MT: Removed method IsShapeParaFocusable which was introduced with IA2 - basically it was only about figuring out wether or not the window has the focus, should be solved differently
// if(IsShapeParaFocusable())
GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
-//-----IAccessibility2 Implementation 2009
}
}
@@ -824,10 +815,7 @@ namespace accessibility
// must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
if ( rType == ::getCppuType((uno::Reference< XAccessibleText > *)0) )
{
- //IAccessibility2 Implementation 2009-----
- // uno::Reference< XAccessibleText > aAccText = this;
uno::Reference< XAccessibleText > aAccText = static_cast< XAccessibleEditableText * >(this);
- //-----IAccessibility2 Implementation 2009
aRet <<= aAccText;
}
else if ( rType == ::getCppuType((uno::Reference< XAccessibleEditableText > *)0) )
@@ -835,13 +823,11 @@ namespace accessibility
uno::Reference< XAccessibleEditableText > aAccEditText = this;
aRet <<= aAccEditText;
}
- //IAccessibility2 Implementation 2009-----
else if ( rType == ::getCppuType((uno::Reference< XAccessibleHypertext > *)0) )
{
uno::Reference< XAccessibleHypertext > aAccHyperText = this;
aRet <<= aAccHyperText;
}
- //-----IAccessibility2 Implementation 2009
else
{
aRet = AccessibleTextParaInterfaceBase::queryInterface(rType);
@@ -939,7 +925,6 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- //IAccessibility2 Implementation 2009-----
::vos::OGuard aGuard( Application::GetSolarMutex() );
// append first 40 characters from text, or first line, if shorter
@@ -981,7 +966,6 @@ namespace accessibility
}
return ::rtl::OUString( sStr ) + aLine;
- //-----IAccessibility2 Implementation 2009
}
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
@@ -1058,7 +1042,6 @@ namespace accessibility
if( !pStateSet )
return uno::Reference<XAccessibleStateSet>();
-//IAccessibility2 Implementation 2009-----
uno::Reference<XAccessibleStateSet> xParentStates;
if (getAccessibleParent().is())
{
@@ -1069,7 +1052,6 @@ namespace accessibility
{
pStateSet->AddState(AccessibleStateType::EDITABLE);
}
-//-----IAccessibility2 Implementation 2009
return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
}
@@ -1291,7 +1273,6 @@ namespace accessibility
GetParagraphIndex() == aSelection.nEndPara )
{
// caret is always nEndPara,nEndPos
- //IAccessibility2 Implementation 2009-----
EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
aBulletInfo.bVisible &&
@@ -1301,7 +1282,6 @@ namespace accessibility
if( aSelection.nEndPos - nBulletLen >= 0 )
return aSelection.nEndPos - nBulletLen;
}
- //-----IAccessibility2 Implementation 2009
return aSelection.nEndPos;
}
@@ -1327,7 +1307,6 @@ namespace accessibility
return OCommonAccessibleText::getCharacter( nIndex );
}
- //IAccessibility2 Implementation 2009-----
static uno::Sequence< ::rtl::OUString > getAttributeNames()
{
static uno::Sequence< ::rtl::OUString >* pNames = NULL;
@@ -1368,7 +1347,6 @@ namespace accessibility
}
return *pNames;
}
-//-----IAccessibility2 Implementation 2009
struct IndexCompare
{
const PropertyValue* pValues;
@@ -1468,7 +1446,6 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
//Skip the bullet range to ingnore the bullet text
SvxTextForwarder& rCacheTF = GetTextForwarder();
EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
@@ -1492,7 +1469,6 @@ namespace accessibility
// ... and override them with the direct attributes from the specific position
uno::Sequence< beans::PropertyValue > aRunAttribs( getRunAttributes( nIndex, aPropertyNames ) );
- //-----IAccessibility2 Implementation 2009
sal_Int32 nRunAttribs = aRunAttribs.getLength();
const beans::PropertyValue *pRunAttrib = aRunAttribs.getConstArray();
for (sal_Int32 k = 0; k < nRunAttribs; ++k)
@@ -1540,7 +1516,6 @@ namespace accessibility
rRes.Handle = -1;
rRes.State = bIsDirectVal ? PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE;
}
- //IAccessibility2 Implementation 2009-----
if( bSupplementalMode )
{
_correctValues( nIndex, aRes );
@@ -1556,7 +1531,6 @@ namespace accessibility
rRes.Value <<= numStr;
rRes.Handle = -1;
rRes.State = PropertyState_DIRECT_VALUE;
- //-----IAccessibility2 Implementation 2009
//For field object.
String strFieldType = GetFieldTypeNameAtIndex(nIndex);
if (strFieldType.Len() > 0)
@@ -1646,10 +1620,8 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
if ((rPoint.X <= 0) && (rPoint.Y <= 0))
return 0;
- //-----IAccessibility2 Implementation 2009
sal_uInt16 nPara, nIndex;
// offset from surrounding cell/shape
@@ -1781,8 +1753,7 @@ namespace accessibility
return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
}
-//IAccessibility2 Implementation 2009-----
- void AccessibleEditableTextPara::_correctValues( const sal_Int32 nIndex,
+ void AccessibleEditableTextPara::_correctValues( const sal_Int32 /* nIndex */,
uno::Sequence< PropertyValue >& rValues)
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2051,7 +2022,6 @@ namespace accessibility
}
return bExtend;
}
-//-----IAccessibility2 Implementation 2009
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
@@ -2067,7 +2037,6 @@ namespace accessibility
switch( aTextType )
{
- //IAccessibility2 Implementation 2009-----
case AccessibleTextType::CHARACTER:
case AccessibleTextType::WORD:
{
@@ -2075,7 +2044,6 @@ namespace accessibility
ExtendByField( aResult );
break;
}
- //-----IAccessibility2 Implementation 2009
// Not yet handled by OCommonAccessibleText. Missing
// implGetAttributeRunBoundary() method there
case AccessibleTextType::ATTRIBUTE_RUN:
@@ -2113,7 +2081,6 @@ namespace accessibility
}
break;
}
-//IAccessibility2 Implementation 2009-----
case AccessibleTextType::LINE:
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2169,7 +2136,6 @@ namespace accessibility
}
break;
}
-//-----IAccessibility2 Implementation 2009
default:
aResult = OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
break;
@@ -2190,9 +2156,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
-//IAccessibility2 Implementation 2009-----
i18n::Boundary aBoundary;
-//-----IAccessibility2 Implementation 2009
switch( aTextType )
{
// Not yet handled by OCommonAccessibleText. Missing
@@ -2230,7 +2194,6 @@ namespace accessibility
}
break;
}
- //IAccessibility2 Implementation 2009-----
case AccessibleTextType::LINE:
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2341,7 +2304,6 @@ namespace accessibility
ExtendByField( aResult );
break;
}
- //-----IAccessibility2 Implementation 2009
default:
aResult = OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
break;
@@ -2362,9 +2324,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
-//IAccessibility2 Implementation 2009-----
i18n::Boundary aBoundary;
-//-----IAccessibility2 Implementation 2009
switch( aTextType )
{
case AccessibleTextType::ATTRIBUTE_RUN:
@@ -2387,7 +2347,6 @@ namespace accessibility
break;
}
-//IAccessibility2 Implementation 2009-----
case AccessibleTextType::LINE:
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2473,7 +2432,6 @@ namespace accessibility
ExtendByField( aResult );
break;
}
- //-----IAccessibility2 Implementation 2009
default:
aResult = OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
break;
@@ -2550,7 +2508,6 @@ namespace accessibility
if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible )
nBulletLen = aBulletInfo.aText.Len();
ESelection aSelection = MakeSelection (nStartIndex + nBulletLen, nEndIndex + nBulletLen);
- //if( !rCacheTF.IsEditable( MakeSelection(nStartIndex, nEndIndex) ) )
if( !rCacheTF.IsEditable( aSelection ) )
return sal_False; // non-editable area selected
@@ -3048,7 +3005,7 @@ namespace accessibility
// const sal_uInt16 nEEIndex = aIndex.GetEEIndex();
const sal_uInt16 nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex );
- sal_Int32 nHLIndex = 0;
+ sal_Int32 nHLIndex = -1; //i123620
sal_uInt16 nHyperLink = 0;
sal_uInt16 nFields = rT.GetFieldCount( nPara );
for ( sal_uInt16 n = 0; n < nFields; n++ )
Modified: openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleHyperlink.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleHyperlink.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleHyperlink.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleHyperlink.cxx Wed Dec 18 13:27:09 2013
@@ -141,7 +141,6 @@ namespace accessibility
// MT IA2: Accessiblehyperlink.hxx from IA2 CWS - meanwhile we also introduced one in DEV300 (above)
// Keeping this for reference - we probably should get support for image maps in our implementation...
-//IAccessibility2 Implementation 2009-----
/*
@@ -441,6 +440,5 @@ sal_Bool SAL_CALL SvxAccessibleHyperlink
*/
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx Wed Dec 18 13:27:09 2013
@@ -83,9 +83,7 @@ namespace accessibility
return ( lhs.Name == rhs.Name && lhs.Value == rhs.Value );
}
};
-//IAccessibility2 Implementation 2009-----
sal_Unicode cNewLine(0x0a);
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
//
// Static Helper
@@ -122,9 +120,7 @@ sal_Unicode cNewLine(0x0a);
*/
class AccessibleStaticTextBase_Impl
{
- //IAccessibility2 Implementation 2009-----
friend class AccessibleStaticTextBase;
- //-----IAccessibility2 Implementation 2009
public:
// receive pointer to our frontend class and view window
@@ -198,9 +194,7 @@ sal_Unicode cNewLine(0x0a);
sal_Int32 nEndPara, sal_Int32 nEndIndex );
Rectangle GetParagraphBoundingBox() const;
- //IAccessibility2 Implementation 2009-----
sal_Bool RemoveLineBreakCount( sal_Int32& rIndex );
- //-----IAccessibility2 Implementation 2009
private:
@@ -393,9 +387,7 @@ sal_Unicode cNewLine(0x0a);
{
nCurrCount = GetParagraph( nCurrPara ).getCharacterCount();
nCurrIndex += nCurrCount;
- //IAccessibility2 Implementation 2009-----
if( nCurrIndex >= nFlatIndex )
- //-----IAccessibility2 Implementation 2009
{
// check overflow
DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX &&
@@ -485,7 +477,6 @@ sal_Unicode cNewLine(0x0a);
}
return aRect;
}
- //IAccessibility2 Implementation 2009-----
//the input argument is the index(including "\n" ) in the string.
//the function will calculate the actual index(not including "\n") in the string.
//and return true if the index is just at a "\n"
@@ -537,7 +528,6 @@ sal_Unicode cNewLine(0x0a);
}
return sal_False;
}
- //-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
//
// AccessibleStaticTextBase implementation
@@ -726,10 +716,8 @@ sal_Unicode cNewLine(0x0a);
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
//get the actual index without "\n"
mpImpl->RemoveLineBreakCount( nIndex );
- //IAccessibility2 Implementation 2009-----
EPosition aPos( mpImpl->Index2Internal(nIndex) );
@@ -761,10 +749,8 @@ sal_Unicode cNewLine(0x0a);
sal_Int32 i, nCount, nParas;
for( i=0, nCount=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
nCount += mpImpl->GetParagraph(i).getCharacterCount();
- //IAccessibility2 Implementation 2009-----
//count on the number of "\n" which equals number of paragraphs decrease 1.
nCount = nCount + (nParas-1);
- //IAccessibility2 Implementation 2009-----
return nCount;
}
@@ -867,7 +853,6 @@ sal_Unicode cNewLine(0x0a);
if( nStartIndex > nEndIndex )
::std::swap(nStartIndex, nEndIndex);
- //IAccessibility2 Implementation 2009-----
//if startindex equals endindex we will get nothing. So return an empty string directly.
if ( nStartIndex == nEndIndex )
{
@@ -907,21 +892,16 @@ sal_Unicode cNewLine(0x0a);
{
//we don't return the string directly now for that we have to do some further process for "\n"
aRes = mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
- //return mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
- //-----IAccessibility2 Implementation 2009
}
else
{
sal_Int32 i( aStartIndex.nPara );
- //IAccessibility2 Implementation 2009-----
aRes = mpImpl->GetParagraph(i).getTextRange( aStartIndex.nIndex,
mpImpl->GetParagraph(i).getCharacterCount()/*-1*/);
- //-----IAccessibility2 Implementation 2009
++i;
// paragraphs inbetween are fully included
for( ; i<aEndIndex.nPara; ++i )
- //IAccessibility2 Implementation 2009-----
{
aRes += rtl::OUString(cNewLine);
aRes += mpImpl->GetParagraph(i).getText();
@@ -950,16 +930,13 @@ sal_Unicode cNewLine(0x0a);
aRes += rtl::OUString(cNewLine);
}
return aRes;
- //-----IAccessibility2 Implementation 2009
}
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
::vos::OGuard aGuard( Application::GetSolarMutex() );
sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex );
- //-----IAccessibility2 Implementation 2009
EPosition aPos( mpImpl->Range2Internal(nIndex) );
::com::sun::star::accessibility::TextSegment aResult;
@@ -979,7 +956,6 @@ sal_Unicode cNewLine(0x0a);
aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara, 0 ) );
aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength();
}
- //IAccessibility2 Implementation 2009-----
else if ( AccessibleTextType::ATTRIBUTE_RUN == aTextType )
{
SvxAccessibleTextAdapter& rTextForwarder = mpImpl->GetParagraph( aPos.nIndex ).GetTextForwarder();
@@ -991,7 +967,6 @@ sal_Unicode cNewLine(0x0a);
aResult.SegmentEnd = nEndIndex;
}
}
- //-----IAccessibility2 Implementation 2009
else
{
// No special handling required, forward to wrapped class
@@ -999,12 +974,10 @@ sal_Unicode cNewLine(0x0a);
// #112814# Adapt the start index with the paragraph offset
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
- //IAccessibility2 Implementation 2009-----
if ( bLineBreak )
{
aResult.SegmentText = rtl::OUString(cNewLine);
}
- //-----IAccessibility2 Implementation 2009
}
return aResult;
@@ -1013,10 +986,8 @@ sal_Unicode cNewLine(0x0a);
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
sal_Int32 nOldIdx = nIndex;
sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex );
- //-----IAccessibility2 Implementation 2009
EPosition aPos( mpImpl->Range2Internal(nIndex) );
::com::sun::star::accessibility::TextSegment aResult;
@@ -1048,12 +1019,10 @@ sal_Unicode cNewLine(0x0a);
// #112814# Adapt the start index with the paragraph offset
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
- //IAccessibility2 Implementation 2009-----
if ( bLineBreak && (nOldIdx-1) >= 0)
{
aResult = getTextAtIndex( nOldIdx-1, aTextType );
}
- //-----IAccessibility2 Implementation 2009
}
return aResult;
@@ -1062,11 +1031,9 @@ sal_Unicode cNewLine(0x0a);
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
sal_Int32 nTemp = nIndex+1;
sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nTemp );
mpImpl->RemoveLineBreakCount( nIndex );
- //-----IAccessibility2 Implementation 2009
EPosition aPos( mpImpl->Range2Internal(nIndex) );
::com::sun::star::accessibility::TextSegment aResult;
@@ -1092,12 +1059,10 @@ sal_Unicode cNewLine(0x0a);
// #112814# Adapt the start index with the paragraph offset
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
- //IAccessibility2 Implementation 2009-----
if ( bLineBreak )
{
aResult.SegmentText = rtl::OUString(cNewLine) + aResult.SegmentText;
}
- //-----IAccessibility2 Implementation 2009
}
return aResult;
Modified: openoffice/branches/ooxml-osba/main/editeng/source/editeng/editdbg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/editeng/editdbg.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/editeng/editdbg.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/editeng/editdbg.cxx Wed Dec 18 13:27:09 2013
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEn
fprintf( fp, "\n\n ================================================================================" );
fprintf( fp, "\n================== EditEngine & Views ======================================" );
fprintf( fp, "\n================================================================================" );
- fprintf( fp, "\nControl: %"SAL_PRIxUINT32, pEE->GetControlWord() );
+ fprintf( fp, "\nControl: %" SAL_PRIxUINT32, pEE->GetControlWord() );
fprintf( fp, "\nRefMapMode: %i", pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() );
fprintf( fp, "\nPaperSize: %li x %li", pEE->GetPaperSize().Width(), pEE->GetPaperSize().Height() );
fprintf( fp, "\nMaxAutoPaperSize: %li x %li", pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );
Modified: openoffice/branches/ooxml-osba/main/editeng/source/editeng/edtspell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/editeng/edtspell.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/editeng/edtspell.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/editeng/edtspell.cxx Wed Dec 18 13:27:09 2013
@@ -140,9 +140,7 @@ sal_Bool __EXPORT EditSpellWrapper::Spel
if ( pSpellInfo->bMultipleDoc )
{
bMore = pImpEE->GetEditEnginePtr()->SpellNextDocument();
- //IAccessibility2 Implementation 2009-----
SetCurTextObj( pImpEE->GetEditEnginePtr()->GetCurTextObj() );
- //-----IAccessibility2 Implementation 2009
if ( bMore )
{
// Der Text wurde in diese Engine getreten, bei Rueckwaerts
Modified: openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.cxx Wed Dec 18 13:27:09 2013
@@ -122,7 +122,6 @@ void ImpEditView::SetEditSelection( cons
if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() )
{
- //IAccessibility2 Implementation 2009-----
const EditDoc& rDoc = pEditEngine->pImpEditEngine->GetEditDoc();
const EditPaM pmEnd = rDoc.GetEndPaM();
EENotifyType eNotifyType;
@@ -138,7 +137,6 @@ void ImpEditView::SetEditSelection( cons
}
//EENotify aNotify( EE_NOTIFY_TEXTVIEWSELECTIONCHANGED );
EENotify aNotify( eNotifyType );
- //-----IAccessibility2 Implementation 2009
aNotify.pEditEngine = pEditEngine;
aNotify.pEditView = GetEditViewPtr();
pEditEngine->pImpEditEngine->CallNotify( aNotify );
Modified: openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.hxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit.hxx Wed Dec 18 13:27:09 2013
@@ -480,7 +480,6 @@ private:
sal_Bool bInSelection;
sal_Bool bIsInUndo;
sal_Bool bUpdate;
- // IAccessible2 migration fix
sal_Bool bUpdateForAcc;
sal_Bool bUndoEnabled;
sal_Bool bOwnerOfRefDev;
@@ -715,7 +714,6 @@ public:
void SetUpdateMode( sal_Bool bUp, EditView* pCurView = 0, sal_Bool bForceUpdate = sal_False );
sal_Bool GetUpdateMode() const { return bUpdate; }
- // IAccessible2 migration fix
void SetUpdateModeForAcc( sal_Bool bUp);
sal_Bool GetUpdateModeForAcc();
Modified: openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit2.cxx Wed Dec 18 13:27:09 2013
@@ -136,7 +136,7 @@ ImpEditEngine::ImpEditEngine( EditEngine
bIsFormatting = sal_False;
bFormatted = sal_False;
bUpdate = sal_True;
- bUpdateForAcc = TRUE; //IAccessible2 implementation 2009
+ bUpdateForAcc = TRUE;
bUseAutoColor = sal_True;
bForceAutoColor = sal_False;
bAddExtLeading = sal_False;
@@ -2721,7 +2721,7 @@ EditPaM ImpEditEngine::InsertText( const
++nChgPos;
xub_StrLen nChgLen = static_cast< xub_StrLen >( nNewLen - nChgPos );
- String aChgText( aNewText.copy( nChgPos ), nChgLen );
+ String aChgText( aNewText.copy( nChgPos ).getStr(), nChgLen );
// select text from first pos to be changed to current pos
EditSelection aSel( EditPaM( aPaM.GetNode(), (sal_uInt16) nChgPos ), aPaM );
Modified: openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/editeng/impedit3.cxx Wed Dec 18 13:27:09 2013
@@ -368,8 +368,6 @@ void ImpEditEngine::FormatFullDoc()
void ImpEditEngine::FormatDoc()
{
- // IAccessible2 migration fix
- //if ( !GetUpdateMode() || IsFormatting() )
if ( !GetUpdateMode() || IsFormatting() || !GetUpdateModeForAcc())
return;
@@ -3862,16 +3860,16 @@ EditPaM ImpEditEngine::ConnectContents(
DBG_ASSERT( IsInUndo(), "ConnectContent nur fuer Undo()!" );
return ImpConnectParagraphs( pLeftNode, pRightNode, bBackward );
}
-//IAccessible2 migration fix
+
void ImpEditEngine::SetUpdateModeForAcc( sal_Bool bUp)
{
bUpdateForAcc = bUp;
}
+
sal_Bool ImpEditEngine::GetUpdateModeForAcc()
{
return bUpdateForAcc;
}
-//End
void ImpEditEngine::SetUpdateMode( sal_Bool bUp, EditView* pCurView, sal_Bool bForceUpdate )
{
Modified: openoffice/branches/ooxml-osba/main/editeng/source/misc/splwrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/misc/splwrap.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/misc/splwrap.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/misc/splwrap.cxx Wed Dec 18 13:27:09 2013
@@ -164,13 +164,13 @@ SvxSpellWrapper::SvxSpellWrapper( Window
pWin ( pWn ),
xSpell ( xSpellChecker ),
+ mpTextObj( NULL),
bOtherCntnt ( bOther ),
bDialog ( sal_False ),
bHyphen ( sal_False ),
bAuto ( sal_False ),
bStartChk ( bOther ),
bRevAllowed ( bRevAllow ),
- mpTextObj( NULL),
bAllRight ( bIsAllRight )
{
Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
@@ -190,6 +190,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window
const sal_Bool bStart, const sal_Bool bOther ) :
pWin ( pWn ),
xHyph ( xHyphenator ),
+ mpTextObj( NULL),
bOtherCntnt ( bOther ),
bDialog ( sal_False ),
bHyphen ( sal_False ),
@@ -199,7 +200,6 @@ SvxSpellWrapper::SvxSpellWrapper( Window
bEndDone ( bReverse && bStart && !bOther ),
bStartChk ( bOther ),
bRevAllowed ( sal_False ),
- mpTextObj( NULL),
bAllRight ( sal_True )
{
}
Modified: openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedhlp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedhlp.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedhlp.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedhlp.cxx Wed Dec 18 13:27:09 2013
@@ -28,10 +28,8 @@
#include <editeng/unoedhlp.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
-//IAccessibility2 Implementation 2009-----
#include <svl/itemset.hxx>
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
TYPEINIT1( SvxEditSourceHint, TextHint );
@@ -79,9 +77,7 @@ void SvxEditSourceHint::SetEndValue( sal
{
mnEnd = n;
}
-//IAccessibility2 Implementation 2009-----
TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
@@ -122,10 +118,8 @@ TYPEINIT1( SvxEditSourceHintEndPara , Sv
case EE_NOTIFY_INPUT_END:
return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
- //IAccessibility2 Implementation 2009-----
case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
return ::std::auto_ptr<SfxHint>( new SvxEditSourceHintEndPara( EDITSOURCE_HINT_SELECTIONCHANGED ) );
- //-----IAccessibility2 Implementation 2009
default:
DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
break;
@@ -140,8 +134,7 @@ sal_Bool SvxEditSourceHelper::GetAttribu
// Need to verify implementation with AT (IA2 and ATK)
// Old implementation at the end of the method for reference...
-#if 1 // IA2 CWS
-
+#if 1
//added dummy attributes for the default text
EECharAttribArray aCharAttribs, aTempCharAttribs;
rEE.GetCharAttribs( nPara, aTempCharAttribs );
Modified: openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedprx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedprx.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedprx.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/uno/unoedprx.cxx Wed Dec 18 13:27:09 2013
@@ -508,24 +508,6 @@ String SvxAccessibleTextAdapter::GetText
EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
- //IAccessibility2 Implementation 2009-----
- // MT: This was done in OOo, commented out in IA2 CWS...
- /*
- if( aStartIndex.InBullet() )
- {
- // prepend leading bullet
- String sBullet = aBulletInfo1.aText;
-
- DBG_ASSERT(aStartIndex.GetBulletOffset() >= 0 &&
- aStartIndex.GetBulletOffset() <= USHRT_MAX,
- "SvxAccessibleTextIndex::GetText: index value overflow");
-
- sBullet.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetBulletOffset()) );
-
- sBullet += sStr;
- sStr = sBullet;
- }*/
- //-----IAccessibility2 Implementation 2009
if( aEndIndex.InBullet() )
{
// append trailing bullet
@@ -754,7 +736,6 @@ EBulletInfo SvxAccessibleTextAdapter::Ge
return mrTextForwarder->GetBulletInfo( nPara );
}
-//IAccessible2 Implementation 2009----
void SvxAccessibleTextAdapter::SetUpdateModeForAcc( sal_Bool bUp)
{
return mrTextForwarder->SetUpdateModeForAcc( bUp );
@@ -763,7 +744,6 @@ sal_Bool SvxAccessibleTextAdapter::GetUp
{
return mrTextForwarder->GetUpdateModeForAcc( );
}
-//-----IAccessible2 Implementation 2009
Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
Modified: openoffice/branches/ooxml-osba/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/editeng/source/uno/unonrule.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/editeng/source/uno/unonrule.cxx (original)
+++ openoffice/branches/ooxml-osba/main/editeng/source/uno/unonrule.cxx Wed Dec 18 13:27:09 2013
@@ -221,9 +221,7 @@ Sequence<beans::PropertyValue> SvxUnoNum
}
{
- //IAccessibility2 Implementation 2009-----
if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
- //-----IAccessibility2 Implementation 2009
{
sal_Unicode nCode = rFmt.GetBulletChar();
OUString aStr( &nCode, 1 );
Modified: openoffice/branches/ooxml-osba/main/embeddedobj/source/msole/olepersist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/embeddedobj/source/msole/olepersist.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/embeddedobj/source/msole/olepersist.cxx (original)
+++ openoffice/branches/ooxml-osba/main/embeddedobj/source/msole/olepersist.cxx Wed Dec 18 13:27:09 2013
@@ -1118,7 +1118,7 @@ void OleEmbeddedObject::StoreObjectToStr
m_pOleComponent->StoreOwnTmpIfNecessary();
// now all the changes should be in temporary location
- if ( !m_aTempURL )
+ if( m_aTempURL.isEmpty() )
throw uno::RuntimeException();
// open temporary file for reading
@@ -2087,7 +2087,7 @@ void SAL_CALL OleEmbeddedObject::breakLi
catch ( uno::Exception& )
{
delete pNewOleComponent;
- if ( m_aTempURL )
+ if( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
m_aTempURL = aOldTempURL;
throw;
@@ -2099,7 +2099,7 @@ void SAL_CALL OleEmbeddedObject::breakLi
catch( uno::Exception& )
{
delete pNewOleComponent;
- if ( m_aTempURL )
+ if( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
m_aTempURL = aOldTempURL;
throw;
Modified: openoffice/branches/ooxml-osba/main/extensions/source/bibliography/general.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/extensions/source/bibliography/general.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/extensions/source/bibliography/general.cxx (original)
+++ openoffice/branches/ooxml-osba/main/extensions/source/bibliography/general.cxx Wed Dec 18 13:27:09 2013
@@ -508,7 +508,7 @@ uno::Reference< awt::XControlModel > Bi
{
::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME );
DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
- sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ sId += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 );
xPropSet->setPropertyValue( uProp, makeAny( sId ) );
}
Modified: openoffice/branches/ooxml-osba/main/extensions/source/config/ldap/ldapaccess.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/extensions/source/config/ldap/ldapaccess.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/extensions/source/config/ldap/ldapaccess.cxx (original)
+++ openoffice/branches/ooxml-osba/main/extensions/source/config/ldap/ldapaccess.cxx Wed Dec 18 13:27:09 2013
@@ -150,8 +150,8 @@ void LdapConnection::connectSimple()
// Do the bind
LdapErrCode retCode = (*s_p_simple_bind_s)(mConnection,
- mLdapDefinition.mAnonUser ,
- mLdapDefinition.mAnonCredentials) ;
+ mLdapDefinition.mAnonUser.getStr(),
+ mLdapDefinition.mAnonCredentials.getStr()) ;
checkLdapReturnCode("SimpleBind", retCode, mConnection) ;
}
@@ -170,14 +170,14 @@ void LdapConnection::initConnection()
if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT;
- mConnection = (*s_p_init)(mLdapDefinition.mServer,
+ mConnection = (*s_p_init)( mLdapDefinition.mServer.getStr(),
mLdapDefinition.mPort) ;
if (mConnection == NULL)
{
rtl::OUStringBuffer message ;
message.appendAscii("Cannot initialise connection to LDAP server ") ;
- message.appendAscii(mLdapDefinition.mServer) ;
+ message.appendAscii( mLdapDefinition.mServer.getStr());
message.appendAscii(":") ;
message.append(mLdapDefinition.mPort) ;
throw ldap::LdapConnectionException(message.makeStringAndClear(),
@@ -197,7 +197,7 @@ void LdapConnection::initConnection()
LdapMessageHolder result;
LdapErrCode retCode = (*s_p_search_s)(mConnection,
- aUserDn,
+ aUserDn.getStr(),
LDAP_SCOPE_BASE,
"(objectclass=*)",
0,
@@ -231,7 +231,7 @@ void LdapConnection::initConnection()
{
throw lang::IllegalArgumentException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
- ("LdapConnection::findUserDn -User id is empty")),
+ ("LdapConnection::findUserDn -User id is empty")).getStr(),
NULL, 0) ;
}
@@ -247,9 +247,9 @@ void LdapConnection::initConnection()
attributes[0]= const_cast<sal_Char *>(LDAP_NO_ATTRS);
attributes[1]= NULL;
LdapErrCode retCode = (*s_p_search_s)(mConnection,
- mLdapDefinition.mBaseDN,
+ mLdapDefinition.mBaseDN.getStr(),
LDAP_SCOPE_SUBTREE,
- filter.makeStringAndClear(), attributes, 0, &result.msg) ;
+ filter.getStr(), attributes, 0, &result.msg) ;
checkLdapReturnCode("FindUserDn", retCode,mConnection) ;
rtl::OString userDn ;
Modified: openoffice/branches/ooxml-osba/main/extensions/source/logging/filehandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/extensions/source/logging/filehandler.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/extensions/source/logging/filehandler.cxx (original)
+++ openoffice/branches/ooxml-osba/main/extensions/source/logging/filehandler.cxx Wed Dec 18 13:27:09 2013
@@ -203,7 +203,7 @@ namespace logging
sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) );
sMessage.append( "\nerror code: " );
sMessage.append( (sal_Int32)res );
- OSL_ENSURE( false, sMessage.makeStringAndClear() );
+ OSL_ENSURE( false, sMessage.getStr() );
}
#endif
if ( m_eFileValidity == eValid )
Modified: openoffice/branches/ooxml-osba/main/extensions/source/ole/oleobjw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/extensions/source/ole/oleobjw.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/extensions/source/ole/oleobjw.cxx (original)
+++ openoffice/branches/ooxml-osba/main/extensions/source/ole/oleobjw.cxx Wed Dec 18 13:27:09 2013
@@ -2333,6 +2333,50 @@ void IUnknownWrapper_Impl::getPropDesc(c
//else no entry for sFuncName, pFuncDesc will not be filled in
}
+VARTYPE lcl_getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType )
+{
+ VARTYPE _type( VT_NULL );
+ if ( pTypeInfo )
+ {
+ CComPtr<ITypeInfo> spRefInfo;
+ pTypeInfo->GetRefTypeInfo( nHrefType, &spRefInfo.p );
+ if ( spRefInfo )
+ {
+ TypeAttr attr( spRefInfo );
+ spRefInfo->GetTypeAttr( &attr );
+ if ( attr->typekind == TKIND_ENUM )
+ {
+ // We use the type of the first enum value.
+ if ( attr->cVars == 0 )
+ {
+ throw BridgeRuntimeError(OUSTR("[automation bridge] Could not obtain type description"));
+ }
+ VarDesc var( spRefInfo );
+ spRefInfo->GetVarDesc( 0, &var );
+ _type = var->lpvarValue->vt;
+ }
+ else if ( attr->typekind == TKIND_INTERFACE )
+ {
+ _type = VT_UNKNOWN;
+ }
+ else if ( attr->typekind == TKIND_DISPATCH )
+ {
+ _type = VT_DISPATCH;
+ }
+ else if ( attr->typekind == TKIND_ALIAS )
+ {
+ // TKIND_ALIAS is a type that is an alias for another type. So get that alias type.
+ _type = lcl_getUserDefinedElementType( pTypeInfo, attr->tdescAlias.hreftype );
+ }
+ else
+ {
+ throw BridgeRuntimeError( OUSTR("[automation bridge] Unhandled user defined type.") );
+ }
+ }
+ }
+ return _type;
+}
+
VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
{
VARTYPE _type( VT_NULL );
@@ -2350,38 +2394,7 @@ VARTYPE IUnknownWrapper_Impl::getElement
else if (desc->vt == VT_USERDEFINED)
{
ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
- CComPtr<ITypeInfo> spRefInfo;
- thisInfo->GetRefTypeInfo(desc->hreftype, & spRefInfo.p);
- if (spRefInfo)
- {
- TypeAttr attr(spRefInfo);
- spRefInfo->GetTypeAttr( & attr);
- if (attr->typekind == TKIND_ENUM)
- {
- //We use the type of the first enum value.
- if (attr->cVars == 0)
- {
- throw BridgeRuntimeError(OUSTR("[automation bridge] Could "
- "not obtain type description"));
- }
- VarDesc var(spRefInfo);
- spRefInfo->GetVarDesc(0, & var);
- _type = var->lpvarValue->vt;
- }
- else if (attr->typekind == TKIND_INTERFACE)
- {
- _type = VT_UNKNOWN;
- }
- else if (attr->typekind == TKIND_DISPATCH)
- {
- _type = VT_DISPATCH;
- }
- else
- {
- throw BridgeRuntimeError(OUSTR("[automation bridge] "
- "Unhandled user defined type."));
- }
- }
+ _type = lcl_getUserDefinedElementType( thisInfo, desc->hreftype );
}
else
{
Modified: openoffice/branches/ooxml-osba/main/extensions/source/propctrlr/pcrcommon.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/extensions/source/propctrlr/pcrcommon.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/extensions/source/propctrlr/pcrcommon.cxx (original)
+++ openoffice/branches/ooxml-osba/main/extensions/source/propctrlr/pcrcommon.cxx Wed Dec 18 13:27:09 2013
@@ -61,7 +61,7 @@ namespace pcr
::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
{
::rtl::OUStringBuffer aBuffer;
- ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ ::rtl::OUString aTmp( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ));
INetURLObject aHID( aTmp );
if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
aBuffer.appendAscii( INET_HID_SCHEME );
Modified: openoffice/branches/ooxml-osba/main/extensions/source/update/check/updatecheckconfig.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/extensions/source/update/check/updatecheckconfig.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/extensions/source/update/check/updatecheckconfig.cxx (original)
+++ openoffice/branches/ooxml-osba/main/extensions/source/update/check/updatecheckconfig.cxx Wed Dec 18 13:27:09 2013
@@ -183,7 +183,7 @@ UpdateCheckROModel::getUpdateEntry(Updat
rtl::OString aStr(RELEASE_NOTE);
for(sal_Int32 n=1; n < 6; ++n )
{
- rtl::OUString aUStr = getStringValue(aStr + rtl::OString::valueOf(n));
+ rtl::OUString aUStr = getStringValue( (aStr + rtl::OString::valueOf(n)).getStr());
if( aUStr.getLength() > 0 )
rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr));
}
Modified: openoffice/branches/ooxml-osba/main/filter/source/msfilter/eschesdo.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/filter/source/msfilter/eschesdo.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/filter/source/msfilter/eschesdo.hxx (original)
+++ openoffice/branches/ooxml-osba/main/filter/source/msfilter/eschesdo.hxx Wed Dec 18 13:27:09 2013
@@ -61,6 +61,9 @@ public:
sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 )
{ return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; }
+ sal_Bool ImplGetPropertyValue( const rtl::OUString& rStr ) { return ImplGetPropertyValue( rStr.getStr() ); }
+ sal_Bool ImplGetInt32PropertyValue( const rtl::OUString& rStr ) { return ImplGetInt32PropertyValue( rStr.getStr() ); }
+
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; }
const ::com::sun::star::uno::Any& GetUsrAny() const { return mAny; }
const String& GetType() const { return mType; }